diff --git a/src/Resources/translations/gc_ru.ts b/src/Resources/translations/gc_ru.ts
index b63f865d1..f4c3de02e 100644
--- a/src/Resources/translations/gc_ru.ts
+++ b/src/Resources/translations/gc_ru.ts
@@ -4,18 +4,18 @@
 <context>
     <name>AAvgPower</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1106"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1164"/>
         <source>Average aPower</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1107"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1108"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1165"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1166"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1110"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1168"/>
         <source>Average altitude power. Recorded power adjusted to take into account the effect of altitude on vo2max and thus power output.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -23,7 +23,35 @@
 <context>
     <name>ANTlocalController</name>
     <message>
-        <location filename="../../ANT/ANTlocalController.cpp" line="140"/>
+        <location filename="../../ANT/ANTlocalController.cpp" line="73"/>
+        <source>Found Garmin Express service</source>
+        <translation>Обнаружен работающий процесс Garmin Express</translation>
+    </message>
+    <message>
+        <location filename="../../ANT/ANTlocalController.cpp" line="74"/>
+        <source>The Garmin Express service is active on your computer.
+This can block GoldenCheetah from accessing your ANT+ stick.
+
+Do you want to temporarily disable the service?</source>
+        <translation>Обнаружен активный процесс Garmin Express на этом компьютере,
+который может блокировать доступ к передатчику ANT+ программой Golden Cheetah.
+
+Попробовать временно отключить этот процесс?</translation>
+    </message>
+    <message>
+        <location filename="../../ANT/ANTlocalController.cpp" line="84"/>
+        <source>Failed stopping Garmin Express service</source>
+        <translation>Не удалось  остановить процесс Garmin Express</translation>
+    </message>
+    <message>
+        <location filename="../../ANT/ANTlocalController.cpp" line="85"/>
+        <source>GoldenCheetah failed to stop the Garmin Express service.
+It might be necessary to manually disable it.</source>
+        <translation>GoldenCheetah не смог остановить работающий процесс службы Garmin Connect.
+Попробуйте вручную завершить его.</translation>
+    </message>
+    <message>
+        <location filename="../../ANT/ANTlocalController.cpp" line="164"/>
         <source>Cannot open ANT+ device</source>
         <translation>Невозможно открыть устройство с протоколом ANT+</translation>
     </message>
@@ -31,12 +59,12 @@
 <context>
     <name>APPercent</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1518"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1576"/>
         <source>Power Percent of Max</source>
         <translation>Мощность в процентах от максимума</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1523"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1581"/>
         <source>Power as percent of Pmax according to Power Zones</source>
         <translation>Мощность в процентах от максимальной Pmax, в зависимости от зоны мощности</translation>
     </message>
@@ -49,22 +77,21 @@
         <translation>О GoldenCheetah</translation>
     </message>
     <message>
-        <location filename="../../Gui/AboutDialog.cpp" line="36"/>
+        <location filename="../../Gui/AboutDialog.cpp" line="33"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
     <message>
-        <location filename="../../Gui/AboutDialog.cpp" line="37"/>
+        <location filename="../../Gui/AboutDialog.cpp" line="34"/>
         <source>Version</source>
         <translation>Версия</translation>
     </message>
     <message>
-        <location filename="../../Gui/AboutDialog.cpp" line="39"/>
         <source>Config</source>
-        <translation>Настройка сборки</translation>
+        <translation type="vanished">Настройка сборки</translation>
     </message>
     <message>
-        <location filename="../../Gui/AboutDialog.cpp" line="41"/>
+        <location filename="../../Gui/AboutDialog.cpp" line="35"/>
         <source>Contributors</source>
         <translation>Участники проекта</translation>
     </message>
@@ -72,22 +99,22 @@
 <context>
     <name>AboutModelPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="722"/>
+        <location filename="../../Gui/Pages.cpp" line="811"/>
         <source>W&apos;bal tau (s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="733"/>
+        <location filename="../../Gui/Pages.cpp" line="822"/>
         <source>STS average (days)</source>
         <translation type="unfinished">Средний STS (дни)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="734"/>
+        <location filename="../../Gui/Pages.cpp" line="823"/>
         <source>LTS average (days)</source>
         <translation type="unfinished">Средний LTS (дни)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="749"/>
+        <location filename="../../Gui/Pages.cpp" line="838"/>
         <source>PMC Stress Balance Today</source>
         <translation type="unfinished"></translation>
     </message>
@@ -99,69 +126,73 @@
         <translation type="vanished">&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;ПО анализа показателей мощности для велосипедистов&lt;br&gt;для Linux, Mac и Windows&lt;p&gt;GoldenCheetah разрабатывается под лицензией&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;Исходный код доступен по адресу&lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Файлы тренировок и прочие данные сохраняются в &lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;p&gt; Товарные знаки &lt;br&gt;BikeStress, IsoPower, IF&lt;br&gt; используются с разрешения &lt;a href=&quot;http://www.peaksware.com&quot;&gt;Peaksware LLC&lt;/a&gt;.&lt;br&gt;BikeScore, xPower, SwimScore: &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed: Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Модуль температуры тела разработан &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; и находится в стадтии патентования.&lt;br&gt;&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../Gui/AboutDialog.cpp" line="62"/>
         <source>&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;Cycling Power Analysis Software&lt;br&gt;for Linux, Mac, and Windows&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;Activity files and other data are stored in&lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;p&gt;Trademarks used with permission&lt;br&gt;BikeScore, xPower, SwimScore courtesy of &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed courtesy of Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;The core body temperature module was developed by the &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; and is patent pending&lt;br&gt;&lt;/center&gt;</source>
-        <translation>&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;ПО анализа показателей мощности для велосипедистов&lt;br&gt;для Linux, Mac и Windows&lt;p&gt;GoldenCheetah разрабатывается под лицензией&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;Исходный код доступен по адресу &lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Файлы тренировок и прочие данные сохраняются в &lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;p&gt;Товарные знаки &lt;br&gt;BikeScore, xPower, SwimScore courtesy of &lt;br&gt; используются с разрешения &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed courtesy of Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Модуль температуры тела разработан &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; и находится в стадтии патентования.&lt;br&gt;&lt;/center&gt;</translation>
+        <translation type="vanished">&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;ПО анализа показателей мощности для велосипедистов&lt;br&gt;для Linux, Mac и Windows&lt;p&gt;GoldenCheetah разрабатывается под лицензией&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;Исходный код доступен по адресу &lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Файлы тренировок и прочие данные сохраняются в &lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;p&gt;Товарные знаки &lt;br&gt;BikeScore, xPower, SwimScore courtesy of &lt;br&gt; используются с разрешения &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed courtesy of Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Модуль температуры тела разработан &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; и находится в стадтии патентования.&lt;br&gt;&lt;/center&gt;</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/AboutDialog.cpp" line="56"/>
+        <source>&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;Cycling Power Analysis Software&lt;br&gt;for Linux, Mac, and Windows&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;br&gt;&lt;p&gt;Activity files and other data are stored in&lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&lt;p&gt;Athlete ID %3&lt;br&gt;&lt;p&gt;Trademarks used with permission&lt;br&gt;BikeScore, xPower, SwimScore courtesy of &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed courtesy of Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;The core body temperature module was developed by the &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; and is patent pending&lt;br&gt;&lt;/center&gt;</source>
+        <translation>&lt;center&gt;&lt;img src=&quot;:images/gc.png&quot; height=80&gt;&lt;h2&gt;GoldenCheetah&lt;/h2&gt;ПО анализа показателей мощности для велосипедистов&lt;br&gt;для Linux, Mac и Windows&lt;p&gt;GoldenCheetah разрабатывается под лицензией&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;Исходный код доступен по адресу &lt;br&gt;&lt;a href=&quot;http://goldencheetah.org/&quot;&gt;http://goldencheetah.org/&lt;/a&gt;.&lt;p&gt;Файлы тренировок и прочие данные сохраняются в &lt;br&gt;&lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt;&gt;&lt;p&gt;ID спортсмена: %3&lt;br&gt;&lt;p&gt;Товарные знаки &lt;br&gt;BikeScore, xPower, SwimScore courtesy of &lt;br&gt; используются с разрешения &lt;a href=&quot;http://www.physfarm.com&quot;&gt;Physfarm Training Systems&lt;/a&gt;.&lt;br&gt;Virtual Speed courtesy of Tom Compton &lt;a href=&quot;http://www.analyticcycling.com&quot;&gt;AnalyticCycling&lt;/a&gt;.&lt;br&gt;&lt;br&gt;Модуль температуры тела разработан &lt;br&gt;&lt;a href=&quot;http://www.usariem.army.mil/&quot;&gt;U.S. Army Research Institute of Environmental Medicine&lt;/a&gt;&lt;br&gt; и находится в стадтии патентования.&lt;br&gt;&lt;/center&gt;</translation>
     </message>
 </context>
 <context>
     <name>AboutRiderPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="500"/>
+        <location filename="../../Gui/Pages.cpp" line="589"/>
         <source>Nickname</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="501"/>
+        <location filename="../../Gui/Pages.cpp" line="590"/>
         <source>Date of Birth</source>
         <translation>Дата рождения</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="502"/>
+        <location filename="../../Gui/Pages.cpp" line="591"/>
         <source>Sex</source>
         <translation>Пол</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="503"/>
-        <location filename="../../Gui/Pages.cpp" line="641"/>
-        <location filename="../../Gui/Pages.cpp" line="646"/>
+        <location filename="../../Gui/Pages.cpp" line="592"/>
+        <location filename="../../Gui/Pages.cpp" line="730"/>
+        <location filename="../../Gui/Pages.cpp" line="735"/>
         <source>Height (%1)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Рост (%1)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="503"/>
-        <location filename="../../Gui/Pages.cpp" line="641"/>
+        <location filename="../../Gui/Pages.cpp" line="592"/>
+        <location filename="../../Gui/Pages.cpp" line="730"/>
         <source>cm</source>
         <translation type="unfinished">см</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="503"/>
-        <location filename="../../Gui/Pages.cpp" line="646"/>
+        <location filename="../../Gui/Pages.cpp" line="592"/>
+        <location filename="../../Gui/Pages.cpp" line="735"/>
         <source>in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">дюйм</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="515"/>
+        <location filename="../../Gui/Pages.cpp" line="604"/>
         <source>Male</source>
         <translation>Мужской</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="516"/>
+        <location filename="../../Gui/Pages.cpp" line="605"/>
         <source>Female</source>
         <translation>Женский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="544"/>
+        <location filename="../../Gui/Pages.cpp" line="633"/>
         <source>Crank Length</source>
         <translation>Длина шатуна</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="577"/>
+        <location filename="../../Gui/Pages.cpp" line="666"/>
         <source>Wheelsize</source>
         <translation>Диаметр колёс</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="591"/>
+        <location filename="../../Gui/Pages.cpp" line="680"/>
         <source>mm</source>
         <translation>мм</translation>
     </message>
@@ -186,12 +217,12 @@
         <translation type="vanished">Частота авторезервирования</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="655"/>
+        <location filename="../../Gui/Pages.cpp" line="744"/>
         <source>Choose Picture</source>
         <translation>Выберите фотографию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="656"/>
+        <location filename="../../Gui/Pages.cpp" line="745"/>
         <source>Images (*.png *.jpg *.bmp)</source>
         <translation>Изображения (*.png *.jpg *.bmp)</translation>
     </message>
@@ -242,12 +273,12 @@
 <context>
     <name>ActivityCRC</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3706"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3764"/>
         <source>Checksum</source>
         <translation>Контрольная сумма</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3710"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3768"/>
         <source>A checksum for the activity, can be used to trigger cache refresh in R scripts.</source>
         <translation>Контрольная сумма тренировки может быть использована в качестве триггера для обновления кеша в скриптах на языке R.</translation>
     </message>
@@ -255,12 +286,12 @@
 <context>
     <name>AddAthlete</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="368"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="440"/>
         <source>Coached Athletes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="369"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="441"/>
         <source>Select Athlete for this account</source>
         <translation type="unfinished"></translation>
     </message>
@@ -268,113 +299,148 @@
 <context>
     <name>AddAuth</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="202"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="255"/>
         <source>Service Credentials </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Учётные данные Сервиса </translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="203"/>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="275"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="256"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="345"/>
         <source>Credentials and authorisation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Учётные данные и авторизация</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="221"/>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="232"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="274"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="287"/>
         <source>Authorise</source>
         <translation type="unfinished">Авторизоваться</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="228"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="283"/>
         <source>URL</source>
         <translation type="unfinished">URL</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="229"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="284"/>
         <source>Key (optional)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ключ (опционально)</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="230"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="285"/>
         <source>Username</source>
         <translation type="unfinished">Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="231"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="286"/>
         <source>Password</source>
         <translation type="unfinished">Пароль</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="233"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="288"/>
         <source>Token</source>
+        <translation type="unfinished">Токен</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="289"/>
+        <source>Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="296"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="368"/>
         <source>%1 Credentials and authorisation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1: Учётные данные и авторизация</translation>
     </message>
 </context>
 <context>
     <name>AddClass</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="85"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="88"/>
         <source>Service Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Тип Сервиса</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="86"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="89"/>
         <source>What type of Service are you adding an account for ?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Для какого сервиса вы добавляете учетную запись?</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="95"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="99"/>
         <source>Activities</source>
         <translation type="unfinished">Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="95"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="99"/>
         <source>Sync activities with services like Today&apos;s Plan, Strava, Dropbox and Google Drive</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Синхронизировать тренировки с сервисами типа Today&apos;s Plan, Strava, Dropbox, Google Drive</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="106"/>
+        <source>Measurements</source>
+        <translation type="unfinished">Измерения</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="106"/>
+        <source>Sync measurements such as weight, body fat, HRV and sleep.</source>
+        <translation type="unfinished">Синхронизировать данные измерений, такие как вес, телесный жир, сон и HRV.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="113"/>
+        <source>Sync planned workouts to WebDAV and CalDAV calendars like Google Calendar.</source>
+        <translation type="unfinished">Синхронизировать план тренировок в календарь WebDAV и CalDAV (Google Calendar).</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="102"/>
         <source>Measures</source>
-        <translation type="unfinished">Метрики</translation>
+        <translation type="obsolete">Метрики</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="102"/>
         <source>Sync measures data such as weight, body fat, HRV and sleep.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Синхронизировать данные измерений, такие как вес, телесный жир, сон и HRV.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="110"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="113"/>
         <source>Calendar</source>
         <translation type="unfinished">Календарь</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="110"/>
         <source>Sync planned workouts to WebDAV and CalDAV calendars.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Синхронизировать план тренировок в календарь WebDAV и CalDAV.</translation>
     </message>
 </context>
 <context>
     <name>AddCloudWizard</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="58"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="60"/>
         <source>Add Cloud Wizard</source>
+        <translation>Мастер добавления облачного аккаунта</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="68"/>
+        <source>Edit Account Details</source>
+        <translation>Редактирование свойств аккаунта</translation>
+    </message>
+</context>
+<context>
+    <name>AddConsent</name>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="216"/>
+        <source>Terms of Service</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="65"/>
-        <source>Edit Account Details</source>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="217"/>
+        <source>Your consent is needed</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="227"/>
+        <source>Accept</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>AddDeviceWizard</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="54"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="55"/>
         <source>Add Device Wizard</source>
         <translation>Мастер добавления устройств</translation>
     </message>
@@ -382,17 +448,17 @@
 <context>
     <name>AddFinal</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1081"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1178"/>
         <source>Done</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1082"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1179"/>
         <source>Confirm configuration and add device</source>
         <translation>Подтвердите настройки и добавьте устройство</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1087"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1184"/>
         <source>We will now add a new device with the configuration shown below. Please take a moment to review and then click Finish to add the device and complete this wizard, or press the Back button to make amendments.
 
 </source>
@@ -401,392 +467,392 @@
 </translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1098"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1195"/>
         <source>Name*</source>
         <translation>Название*</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1099"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1196"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1100"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1197"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1109"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1206"/>
         <source>Virtual</source>
         <translation>Виртуальный</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1196"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1293"/>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1214"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1311"/>
         <source>Wheel Size</source>
         <translation>Диаметр колёс</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1113"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1210"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1114"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1211"/>
         <source>Power - Kurt Kinetic Cyclone</source>
         <translation>Велостанок - Kurt Kinetic Cyclone</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1115"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1212"/>
         <source>Power - Kurt Kinetic Road Machine</source>
         <translation>Велостанок - Kurt Kinetic Road Machine</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1116"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1213"/>
         <source>Power - Cyclops Fluid 2</source>
         <translation>Велостанок - Cyclops Fluid 2</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1117"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1214"/>
         <source>Power - BT Advanced Training System</source>
         <translation>Велостанок - BT Advanced Training System</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1118"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1215"/>
         <source>Power - LeMond Revolution</source>
         <translation>Велостанок - LeMond Revolution</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1119"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1216"/>
         <source>Power - 1UP USA Trainer</source>
         <translation>Велостанок - 1UP USA Trainer</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1120"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1217"/>
         <source>Power - Minoura V100 Trainer (H)</source>
         <translation>Велостанок - Minoura V100 Trainer (H)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1121"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1218"/>
         <source>Power - Minoura V100 Trainer (5)</source>
         <translation>Велостанок - Minoura V100 Trainer (5)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1122"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1219"/>
         <source>Power - Minoura V100 Trainer (4)</source>
         <translation>Велостанок - Minoura V100 Trainer (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1123"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1220"/>
         <source>Power - Minoura V100 Trainer (3)</source>
         <translation>Велостанок - Minoura V100 Trainer (3)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1124"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1221"/>
         <source>Power - Minoura V100 Trainer (2)</source>
         <translation>Велостанок - Minoura V100 Trainer (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1125"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1222"/>
         <source>Power - Minoura V100 Trainer (1)</source>
         <translation>Велостанок - Minoura V100 Trainer (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1126"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1223"/>
         <source>Power - Minoura V100 Trainer (L)</source>
         <translation>Велостанок - Minoura V100 Trainer (L)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1127"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1224"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (H)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (H)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1128"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1225"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (5)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (5)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1129"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1226"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (4)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1130"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1227"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (3)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (3)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1131"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1228"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (2)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1132"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1229"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (1)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1133"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1230"/>
         <source>Power - Minoura V270/V150/V130/LR340/LR540 Trainer (L)</source>
         <translation>Велостанок - Minoura V270/V150/V130/LR340/LR540 Trainer (L)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1134"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1231"/>
         <source>Power - Saris Powerbeam Pro</source>
         <translation>Велостанок - Saris Powerbeam Pro</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1135"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1232"/>
         <source>Power - Tacx Satori (2)</source>
         <translation>Велостанок - Tacx Satori (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1136"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1233"/>
         <source>Power - Tacx Satori (4)</source>
         <translation>Велостанок - Tacx Satori (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1137"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1234"/>
         <source>Power - Tacx Satori (6)</source>
         <translation>Велостанок - Tacx Satori (6)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1138"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1235"/>
         <source>Power - Tacx Satori (8)</source>
         <translation>Велостанок - Tacx Satori (8)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1139"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1236"/>
         <source>Power - Tacx Satori (10)</source>
         <translation>Велостанок - Tacx Satori (10)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1140"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1237"/>
         <source>Power - Tacx Flow (0)</source>
         <translation>Велостанок - Tacx Flow (0)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1141"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1238"/>
         <source>Power - Tacx Flow (2)</source>
         <translation>Велостанок - Tacx Flow (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1142"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1239"/>
         <source>Power - Tacx Flow (4)</source>
         <translation>Велостанок - Tacx Flow (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1143"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1240"/>
         <source>Power - Tacx Flow (6)</source>
         <translation>Велостанок - Tacx Flow (6)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1144"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1241"/>
         <source>Power - Tacx Flow (8)</source>
         <translation>Велостанок - Tacx Flow (8)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1145"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1242"/>
         <source>Power - Tacx Blue Twist (1)</source>
         <translation>Велостанок - Tacx Blue Twist (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1146"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1243"/>
         <source>Power - Tacx Blue Twist (3)</source>
         <translation>Велостанок - Tacx Blue Twist (3)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1147"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1244"/>
         <source>Power - Tacx Blue Twist (5)</source>
         <translation>Велостанок - Tacx Blue Twist (5)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1148"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1245"/>
         <source>Power - Tacx Blue Twist (7)</source>
         <translation>Велостанок - Tacx Blue Twist (7)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1149"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1246"/>
         <source>Power - Tacx Blue Motion (2)</source>
         <translation>Велостанок - Tacx Blue Motion (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1150"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1247"/>
         <source>Power - Tacx Blue Motion (4)</source>
         <translation>Велостанок - Tacx Blue Motion (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1151"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1248"/>
         <source>Power - Tacx Blue Motion (6)</source>
         <translation>Велостанок - Tacx Blue Motion (6)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1152"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1249"/>
         <source>Power - Tacx Blue Motion (8)</source>
         <translation>Велостанок - Tacx Blue Motion (8)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1153"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1250"/>
         <source>Power - Tacx Blue Motion (10)</source>
         <translation>Велостанок - Tacx Blue Motion (10)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1154"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1251"/>
         <source>Power - Elite Supercrono Powermag (1)</source>
         <translation>Велостанок - Elite Supercrono Powermag (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1155"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1252"/>
         <source>Power - Elite Supercrono Powermag (2)</source>
         <translation>Велостанок - Elite Supercrono Powermag (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1156"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1253"/>
         <source>Power - Elite Supercrono Powermag (3)</source>
         <translation>Велостанок - Elite Supercrono Powermag (3)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1157"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1254"/>
         <source>Power - Elite Supercrono Powermag (4)</source>
         <translation>Велостанок - Elite Supercrono Powermag (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1158"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1255"/>
         <source>Power - Elite Supercrono Powermag (5)</source>
         <translation>Велостанок - Elite Supercrono Powermag (5)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1159"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1256"/>
         <source>Power - Elite Supercrono Powermag (6)</source>
         <translation>Велостанок - Elite Supercrono Powermag (6)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1160"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1257"/>
         <source>Power - Elite Supercrono Powermag (7)</source>
         <translation>Велостанок - Elite Supercrono Powermag (7)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1161"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1258"/>
         <source>Power - Elite Supercrono Powermag (8)</source>
         <translation>Велостанок - Elite Supercrono Powermag (8)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1162"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1259"/>
         <source>Power - Elite Turbo Muin (2013)</source>
         <translation>Велостанок - Elite Turbo Muin (2013)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1163"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1260"/>
         <source>Power - Elite Qubo Power Fluid</source>
         <translation>Велостанок - Elite Qubo Power Fluid</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1164"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1261"/>
         <source>Power - Cyclops Magneto Pro (Road)</source>
         <translation>Велостанок - Cyclops Magneto Pro (Road)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1165"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1262"/>
         <source>Power - Elite Arion Mag (0)</source>
         <translation>Велостанок - Elite Arion Mag (0)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1166"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1263"/>
         <source>Power - Elite Arion Mag (1)</source>
         <translation>Велостанок - Elite Arion Mag (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1167"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1264"/>
         <source>Power - Elite Arion Mag (2)</source>
         <translation>Велостанок - Elite Arion Mag (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1168"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1265"/>
         <source>Power - Blackburn Tech Fluid</source>
         <translation>Велостанок - Blackburn Tech Fluid</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1169"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1266"/>
         <source>Power - Tacx Sirius (1)</source>
         <translation>Велостанок - Tacx Sirius (1)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1170"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1267"/>
         <source>Power - Tacx Sirius (2)</source>
         <translation>Велостанок - Tacx Sirius (2)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1171"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1268"/>
         <source>Power - Tacx Sirius (3)</source>
         <translation>Велостанок - Tacx Sirius (3)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1172"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1269"/>
         <source>Power - Tacx Sirius (4)</source>
         <translation>Велостанок - Tacx Sirius (4)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1173"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1270"/>
         <source>Power - Tacx Sirius (5)</source>
         <translation>Велостанок - Tacx Sirius (5)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1174"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1271"/>
         <source>Power - Tacx Sirius (6)</source>
         <translation>Велостанок - Tacx Sirius (6)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1175"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1272"/>
         <source>Power - Tacx Sirius (7)</source>
         <translation>Велостанок - Tacx Sirius (7)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1176"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1273"/>
         <source>Power - Tacx Sirius (8)</source>
         <translation>Велостанок - Tacx Sirius (8)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1177"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1274"/>
         <source>Power - Tacx Sirius (9)</source>
         <translation>Велостанок - Tacx Sirius (9)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1178"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1275"/>
         <source>Power - Tacx Sirius (10)</source>
         <translation>Велостанок - Tacx Sirius (10)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1215"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1312"/>
         <source>Stride Length (cm)</source>
         <translation>Длина шага (см)</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1220"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1317"/>
         <source>Selected by default</source>
         <translation>Выбрано по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1227"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1324"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1228"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1325"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1229"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1326"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1230"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1327"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
@@ -794,86 +860,86 @@
 <context>
     <name>AddFinish</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="526"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="632"/>
         <source>Done</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation type="unfinished">Готово</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="527"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="633"/>
         <source>Add Cloud Account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Добавить облачный аккаунт</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="552"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="658"/>
         <source>URL</source>
         <translation type="unfinished">URL</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="553"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="659"/>
         <source>Key</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ключ</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="554"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="660"/>
         <source>Username</source>
         <translation type="unfinished">Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="555"/>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="576"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="661"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="684"/>
         <source>Password</source>
         <translation type="unfinished">Пароль</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="556"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="662"/>
         <source>Token</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Токен</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="557"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="663"/>
         <source>Folder</source>
         <translation type="unfinished">Папка</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="558"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="664"/>
         <source>Athlete ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">ID спортсмена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="580"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="688"/>
         <source>Sync on start</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Синхронизировать при старте</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="582"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="690"/>
         <source>Sync on import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Синхронизировать при импорте</translation>
     </message>
 </context>
 <context>
     <name>AddFirmware</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="485"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="494"/>
         <source>Select Firmware</source>
         <translation>Выбрать прошивку</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="486"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="495"/>
         <source>Select Firmware for Tacx Fortius</source>
         <translation>Выбрать прошивку для Tacx Fortius</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="489"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="498"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="490"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="499"/>
         <source>Copy to Library</source>
         <translation>Скопировать в библиотеку</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="495"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="504"/>
         <source>Tacx Fortius trainers require a firmware file which is provided by Tacx BV. This file is a copyrighted file and cannot be distributed with GoldenCheetah.
 
 On windows it is typically installed in C:\Windows\system32 and is called &apos;FortiusSWPID1942Renum.hex&apos;.
@@ -894,21 +960,73 @@ If you choose to copy to library the file will be copied into the GoldenCheetah
 Если вы выберите «Скопировать в библиотеку», то файл будет скопирован в библиотеку GoldenCheetah, в противном случае GoldenCheetah будет использовать файл из того места, где вы укажете.</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="513"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="522"/>
         <source>File:</source>
         <translation>Файл:</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="570"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="579"/>
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="570"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="579"/>
         <source>Intel Firmware File (*.hex)</source>
         <translation>Файл прошивки в формате Intel (*.hex)</translation>
     </message>
 </context>
+<context>
+    <name>AddImagic</name>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="586"/>
+        <source>Select Device driver</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="587"/>
+        <source>Select Driver for Tacx Imagic</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="590"/>
+        <source>Browse</source>
+        <translation type="unfinished">Обзор</translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="591"/>
+        <source>Copy to Library</source>
+        <translation type="unfinished">Скопировать в библиотеку</translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="597"/>
+        <source>Tacx Imagic trainers require firmware to be loaded. This firmware is embedded within the device driver I-magic.sys which is provided by Tacx BV.This is a copyrighted file and cannot be distributed with GoldenCheetah.
+On windows systems with Tacx Fortius/Imagic installed you will typically find this in C:\Windows\system32.
+
+Alternatively, you can extract it from a Tacx software CD
+On older Fortius cds it lives in the directory FortiusInstall\Support\driver_imagic.
+On later TTS cds it is in support\drivers_usb_interface\32
+
+Place a copy of this file somewhere on this PC and reference it above.
+
+If you choose to copy to library the file will be copied into the GoldenCheetah library, otherwise we will reference it in place. </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="611"/>
+        <source>File:</source>
+        <translation type="unfinished">Файл:</translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="667"/>
+        <source>Open File</source>
+        <translation type="unfinished">Открыть файл</translation>
+    </message>
+    <message>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="667"/>
+        <source>Tacx Device driver (*.sys)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AddIntervalDialog</name>
     <message>
@@ -1136,63 +1254,63 @@ If you choose to copy to library the file will be copied into the GoldenCheetah
 <context>
     <name>AddPair</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="577"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="674"/>
         <source>Pair Devices</source>
         <translation>Подключить устройства</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="578"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="675"/>
         <source>Search for and pair ANT+ devices</source>
         <translation>Найти и подключить устройства по ANT+</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="669"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="766"/>
         <source>Sensor</source>
         <translation>Датчик</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="670"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="767"/>
         <source>ANT+ Id</source>
         <translation>ANT+ Id</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="671"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="768"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="672"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="769"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="704"/>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="748"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="801"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="845"/>
         <source>none</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="718"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="815"/>
         <source>Un-Paired</source>
         <translation>Отключен</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="755"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="852"/>
         <source>Unused</source>
         <translation>Не используется</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="759"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="856"/>
         <source>Master</source>
         <translation>Основной</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="764"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="861"/>
         <source>Searching...</source>
         <translation>Выполняется поиск...</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="775"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="872"/>
         <source>Paired</source>
         <translation>Подключен</translation>
     </message>
@@ -1200,58 +1318,58 @@ If you choose to copy to library the file will be copied into the GoldenCheetah
 <context>
     <name>AddPairBTLE</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="854"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="951"/>
         <source>Pair Devices</source>
         <translation>Подключить устройства</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="855"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="952"/>
         <source>Search for and pair Bluetooth 4.0 devices</source>
         <translation>Найти и подключить устройства по Bluetooth 4.0</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="911"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1008"/>
         <source>Sensor</source>
         <translation>Датчик</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="912"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1009"/>
         <source>BLE Id</source>
         <translation>BLE Id</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="913"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1010"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="914"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1011"/>
         <source>Status</source>
         <translation>Статус</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="946"/>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="990"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1043"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1087"/>
         <source>none</source>
         <translation>нет</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="960"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1057"/>
         <source>Un-Paired</source>
         <translation>Отключен</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="997"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1094"/>
         <source>Unused</source>
         <translation>Не используется</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="999"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1096"/>
         <source>Searching...</source>
         <translation>Выполняется поиск...</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="1010"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="1107"/>
         <source>Paired</source>
         <translation>Подключен</translation>
     </message>
@@ -1259,29 +1377,31 @@ If you choose to copy to library the file will be copied into the GoldenCheetah
 <context>
     <name>AddSearch</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="269"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="275"/>
         <source>Scan for connected devices</source>
         <translation>Поиск подключенных устройств</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="278"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="284"/>
         <source>Please make sure your device is connected, switched on and working. We will scan for the device type you have selected at known ports.
 
 </source>
-        <translation>Убедитесь, что устройство подсоединено, включено и работает. Программа постарается найти его по известным портам с учётом выбранного типа устройств.</translation>
+        <translation type="unfinished">Убедитесь, что устройство подсоединено, включено и работает. Программа постарается найти его по известным портам с учётом выбранного типа устройств.
+
+</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="291"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="297"/>
         <source>Search</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="296"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="302"/>
         <source>If your device is not found you can select the device port manually by using the selection box below.</source>
         <translation>Если устройство не обнаружено, вы можете вручную выбрать порт среди перечисленных ниже.</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="301"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="307"/>
         <source>
 Device found.
 Click Next to Continue
@@ -1292,22 +1412,22 @@ Click Next to Continue
 </translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="346"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="352"/>
         <source>%1 Search</source>
         <translation>Поиск %1</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="355"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="361"/>
         <source>Select COM port</source>
         <translation>Выберите COM-порт</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="383"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="389"/>
         <source>Search Again</source>
         <translation>Поискать снова</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="399"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="405"/>
         <source>
 Device found (%1).
 Press Next to Continue
@@ -1318,7 +1438,7 @@ Press Next to Continue
 </translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="401"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="407"/>
         <source>
 Device found.
 Press Next to Continue
@@ -1329,12 +1449,12 @@ Press Next to Continue
 </translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="418"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="424"/>
         <source>Stop Searching</source>
         <translation>Остановить поиск</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="433"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="439"/>
         <source>Search again</source>
         <translation>Поискать снова</translation>
     </message>
@@ -1342,55 +1462,55 @@ Press Next to Continue
 <context>
     <name>AddService</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="133"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="135"/>
         <source>Account Type</source>
-        <translation type="unfinished">Тип аккаунта</translation>
+        <translation>Тип аккаунта</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="134"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="136"/>
         <source>Select the cloud service type</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите тип облачного сервиса</translation>
     </message>
 </context>
 <context>
     <name>AddSettings</name>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="426"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="498"/>
         <source>Cloud Service Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="432"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="514"/>
         <source>Folder</source>
         <translation type="unfinished">Папка</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="435"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="518"/>
         <source>Browse</source>
         <translation type="unfinished">Обзор</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="436"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="519"/>
         <source>Sync on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="437"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="520"/>
         <source>Sync on import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Синхронизировать при импорте</translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="454"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="538"/>
         <source>Service Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="506"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="608"/>
         <source>Connection Failed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/AddCloudWizard.cpp" line="513"/>
+        <location filename="../../Cloud/AddCloudWizard.cpp" line="615"/>
         <source>Choose Athlete Directory</source>
         <translation type="unfinished">Выберите каталог спортсмена</translation>
     </message>
@@ -1398,12 +1518,12 @@ Press Next to Continue
 <context>
     <name>AddType</name>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="79"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="81"/>
         <source>Select Device</source>
         <translation>Выберите устройство</translation>
     </message>
     <message>
-        <location filename="../../Train/AddDeviceWizard.cpp" line="80"/>
+        <location filename="../../Train/AddDeviceWizard.cpp" line="82"/>
         <source>What kind of device to add</source>
         <translation>Устройство какого типа добавить</translation>
     </message>
@@ -1438,63 +1558,68 @@ Press Next to Continue
 <context>
     <name>Aerolab</name>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="220"/>
-        <location filename="../../Charts/Aerolab.cpp" line="503"/>
+        <location filename="../../Charts/Aerolab.cpp" line="221"/>
+        <location filename="../../Charts/Aerolab.cpp" line="506"/>
         <source>Elevation (m)</source>
         <translation>Подъём (м)</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="222"/>
+        <location filename="../../Charts/Aerolab.cpp" line="223"/>
         <source>Distance (km)</source>
         <translation>Дистанция (км)</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="225"/>
+        <location filename="../../Charts/Aerolab.cpp" line="226"/>
         <source>V-Elevation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="226"/>
+        <location filename="../../Charts/Aerolab.cpp" line="227"/>
         <source>Elevation</source>
         <translation>Подъём</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="511"/>
+        <location filename="../../Charts/Aerolab.cpp" line="514"/>
         <source>Elevation (&apos;)</source>
         <translation>Подъём (&apos;)</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="576"/>
+        <location filename="../../Charts/Aerolab.cpp" line="579"/>
         <source>Distance </source>
         <translation>Дистанция </translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="578"/>
+        <location filename="../../Charts/Aerolab.cpp" line="581"/>
         <source>Time (minutes)</source>
         <translation>Время (минуты)</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="877"/>
+        <location filename="../../Charts/Aerolab.cpp" line="777"/>
+        <source>No ride selected</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/Aerolab.cpp" line="882"/>
         <source>Estimates out-of-range</source>
         <translation>Оценочные параметры вне диапазона</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="880"/>
+        <location filename="../../Charts/Aerolab.cpp" line="885"/>
         <source>At least two segments must be independent</source>
         <translation>Как минимум два сегмента должны быть разные</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="883"/>
+        <location filename="../../Charts/Aerolab.cpp" line="888"/>
         <source>At least two segments must be defined</source>
         <translation>Как минимум два сегмента должны быть заданы</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="891"/>
+        <location filename="../../Charts/Aerolab.cpp" line="896"/>
         <source>Altitude and Power data must be present</source>
         <translation>Высота (подъём) и Мощность должы присутствовать</translation>
     </message>
     <message>
-        <location filename="../../Charts/Aerolab.cpp" line="894"/>
+        <location filename="../../Charts/Aerolab.cpp" line="899"/>
         <source>No activity selected</source>
         <translation>Тренировка не выбрана</translation>
     </message>
@@ -1567,7 +1692,7 @@ Press Next to Continue
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/AerolabWindow.cpp" line="638"/>
+        <location filename="../../Charts/AerolabWindow.cpp" line="637"/>
         <source>Estimate CdA and Crr</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1575,22 +1700,21 @@ Press Next to Continue
 <context>
     <name>AllPlot</name>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3825"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4538"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4541"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3827"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4540"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4543"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4453"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4455"/>
         <source>Heart Rate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3809"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4516"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4523"/>
-        <location filename="../../Charts/AllPlot.cpp" line="7006"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3811"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4518"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4525"/>
         <location filename="../../Charts/AllPlot.cpp" line="7011"/>
         <source>Speed</source>
         <translation>Скорость</translation>
@@ -1601,90 +1725,90 @@ Press Next to Continue
         <translation>Процент</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3733"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4435"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4438"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3735"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4437"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4440"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3749"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4456"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3751"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4458"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3765"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4471"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4474"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3767"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4473"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4476"/>
         <source>Acceleration</source>
         <translation>Ускорение</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3773"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4480"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4483"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3775"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4482"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4485"/>
         <source>Power Delta</source>
         <translation>Дельта мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3781"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4489"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4492"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3783"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4491"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4494"/>
         <source>Cadence Delta</source>
         <translation>Дельта каденса</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3789"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4498"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4501"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3791"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4500"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4503"/>
         <source>Torque Delta</source>
         <translation>Дельта крутящего момента</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3797"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4507"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4510"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3799"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4509"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4512"/>
         <source>Heartrate Delta</source>
         <translation>Дельта ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3835"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4556"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3837"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4558"/>
         <source>W&apos;bal</source>
         <translation>W&apos;bal</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3844"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4563"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4567"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3846"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4565"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4569"/>
         <source>Altitude</source>
         <translation>Высота</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3865"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4589"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3867"/>
         <location filename="../../Charts/AllPlot.cpp" line="4591"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4593"/>
         <source>Headwind</source>
         <translation>Встречный ветер</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3873"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4597"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4600"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3875"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4599"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4602"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3817"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4529"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4532"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3819"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4531"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4534"/>
         <source>Torque</source>
         <translation>Крутящий момент</translation>
     </message>
     <message>
         <location filename="../../Charts/AllPlot.cpp" line="2825"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4547"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4549"/>
         <source>W&apos; Balance (kJ)</source>
         <translation>Баланс W&apos; (кДж)</translation>
     </message>
@@ -1701,24 +1825,24 @@ Press Next to Continue
     </message>
     <message>
         <location filename="../../Charts/AllPlot.cpp" line="2882"/>
-        <location filename="../../Charts/AllPlot.cpp" line="3937"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4669"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4672"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3939"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4671"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4674"/>
         <source>SmO2</source>
         <translation>SmO₂</translation>
     </message>
     <message>
         <location filename="../../Charts/AllPlot.cpp" line="2957"/>
-        <location filename="../../Charts/AllPlot.cpp" line="3857"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4580"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4583"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3859"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4582"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4585"/>
         <source>Slope</source>
         <translation>Наклон</translation>
     </message>
     <message>
         <location filename="../../Charts/AllPlot.cpp" line="3007"/>
         <location filename="../../Charts/AllPlot.cpp" line="3038"/>
-        <location filename="../../Charts/AllPlot.cpp" line="7023"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7025"/>
         <source>Hb</source>
         <translation>Hb</translation>
     </message>
@@ -1743,233 +1867,238 @@ Press Next to Continue
         <translation>Tau=%1, CP=%2, W&apos;=%3, %4 совпадений &gt;2кДж (%5 кДж) %6</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3741"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4444"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4447"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3743"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4446"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4449"/>
         <source>Core Temp</source>
         <translation>Темп. тела</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3757"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4462"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4465"/>
-        <location filename="../../Charts/AllPlot.cpp" line="7025"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3759"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4464"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4467"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7027"/>
         <source>R-R</source>
         <translation>R-R</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3848"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4569"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4573"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3850"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4571"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4575"/>
         <source>Alt/Slope</source>
         <translation>Высота/Наклон</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3881"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4606"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4609"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3883"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4608"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4611"/>
         <source>Anaerobic TISS</source>
         <translation>Анаэробный TISS</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3889"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4615"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4618"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3891"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4617"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4620"/>
         <source>Aerobic TISS</source>
         <translation>Аэробный TISS</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3897"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4624"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4627"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3899"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4626"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4629"/>
         <source>IsoPower</source>
         <translation>IsoPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3905"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4633"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4636"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3907"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4635"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4638"/>
         <source>Vertical Oscillation</source>
         <translation>Вертикальное колебание</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3913"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4642"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4645"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3915"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4644"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4647"/>
         <source>Run Cadence</source>
         <translation>Каденс бега</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3921"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4651"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4654"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3923"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4653"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4656"/>
         <source>GCT</source>
         <translation>GCT</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3929"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4660"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4663"/>
-        <location filename="../../Charts/AllPlot.cpp" line="7027"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3931"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4662"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4665"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7029"/>
         <source>Gear Ratio</source>
         <translation>Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3945"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4678"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4681"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3947"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4680"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4683"/>
         <source>tHb</source>
         <translation>tHb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3953"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4687"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4690"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3955"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4689"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4692"/>
         <source>O2Hb</source>
         <translation>O₂Hb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3961"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4696"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4699"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3963"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4698"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4701"/>
         <source>HHb</source>
         <translation>HHb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3969"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4705"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4708"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3971"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4707"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4710"/>
         <source>xPower</source>
         <translation>xPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3977"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4714"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4717"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3979"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4716"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4719"/>
         <source>Left Pedal Smoothness</source>
         <translation>Плавность педалирования левой</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3985"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4723"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4726"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3987"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4725"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4728"/>
         <source>Right Pedal Smoothness</source>
         <translation>Плавность педалирования правой</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="3993"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4732"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4735"/>
+        <location filename="../../Charts/AllPlot.cpp" line="3995"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4734"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4737"/>
         <source>Left Torque Efficiency</source>
         <translation>Эффективность крутящего момента левой</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4001"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4741"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4744"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4003"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4743"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4746"/>
         <source>Right Torque Efficiency</source>
         <translation>Эффективность крутящего момента правой</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4012"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4757"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4014"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4759"/>
         <source>Left/Right Pedal Center Offset</source>
         <translation>Смещение левой/правой педали от центра</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4020"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4764"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4022"/>
         <location filename="../../Charts/AllPlot.cpp" line="4766"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4768"/>
         <source>Left Power Phase</source>
         <translation>Фаза мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4028"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4773"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4030"/>
         <location filename="../../Charts/AllPlot.cpp" line="4775"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4777"/>
         <source>Right Power Phase</source>
         <translation>Фаза мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4036"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4782"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4038"/>
         <location filename="../../Charts/AllPlot.cpp" line="4784"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4786"/>
         <source>Left Peak Power Phase</source>
         <translation>Фаза пика мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4044"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4791"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4046"/>
         <location filename="../../Charts/AllPlot.cpp" line="4793"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4795"/>
         <source>Right Peak Power Phase</source>
         <translation>Фаза пика мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4054"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4805"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4056"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4807"/>
         <source>L/R Balance</source>
         <translation>Баланс Л/П</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4062"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4811"/>
-        <location filename="../../Charts/AllPlot.cpp" line="4814"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4064"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4813"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4816"/>
         <source>aPower</source>
         <translation>aPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4549"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4551"/>
         <source>Matches</source>
         <translation>Совпадения</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4751"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4753"/>
         <source>Left Pedal Center Offset</source>
         <translation>Смещение от центра оси слева</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4754"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4756"/>
         <source>Right Pedal Center Offset</source>
         <translation>Смещение от центра оси справа</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4799"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4801"/>
         <source>Left Balance</source>
         <translation>Баланс слева</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="4801"/>
+        <location filename="../../Charts/AllPlot.cpp" line="4803"/>
         <source>Right Balance</source>
         <translation>Баланс справа</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="7008"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7015"/>
         <source>min/km</source>
         <translation>мин/км</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="7008"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7015"/>
         <source>min/mile</source>
         <translation>мин/милю</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="7009"/>
-        <location filename="../../Charts/AllPlot.cpp" line="7014"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7016"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7020"/>
         <source>
 %1 %2</source>
         <translation>
 %1 %2</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="7013"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7019"/>
         <source>min/100m</source>
         <translation>мин/100м</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlot.cpp" line="7013"/>
+        <location filename="../../Charts/AllPlot.cpp" line="7019"/>
         <source>min/100yd</source>
         <translation>мин/100 ярдов</translation>
     </message>
+    <message>
+        <location filename="../../Charts/AllPlot.cpp" line="7022"/>
+        <source>W&apos;</source>
+        <translation type="unfinished">W&apos;</translation>
+    </message>
     <message>
         <location filename="../../Charts/AllPlot.cpp" line="2566"/>
         <location filename="../../Charts/AllPlot.cpp" line="2572"/>
@@ -2269,7 +2398,7 @@ Press Next to Continue
     <name>AllPlotWindow</name>
     <message>
         <location filename="../../Charts/AllPlotWindow.cpp" line="190"/>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="443"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="445"/>
         <source>Smooth</source>
         <translation>Сглаживание</translation>
     </message>
@@ -2292,7 +2421,7 @@ Press Next to Continue
         <location filename="../../Charts/AllPlotWindow.cpp" line="201"/>
         <location filename="../../Charts/AllPlotWindow.cpp" line="260"/>
         <source>Overlay</source>
-        <translation>С перекрытием</translation>
+        <translation>Детализация по интервалу</translation>
     </message>
     <message>
         <location filename="../../Charts/AllPlotWindow.cpp" line="229"/>
@@ -2420,58 +2549,62 @@ Press Next to Continue
         <translation>Время контакта с землёй</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="333"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="329"/>
+        <source>Cadence </source>
+        <translation>Каденс </translation>
+    </message>
+    <message>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="335"/>
         <source>SmO2</source>
         <translation>SmO₂</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="335"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="337"/>
         <source>Moxy</source>
         <translation>Moxy</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="337"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="339"/>
         <source>tHb</source>
         <translation>tHb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="341"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="343"/>
         <source>O2Hb</source>
         <translation>O₂Hb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="345"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="347"/>
         <source>HHb</source>
         <translation>HHb</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="350"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="352"/>
         <source>Heart Rate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="352"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="354"/>
         <source>Data series</source>
         <translation>Серия данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="354"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="356"/>
         <source>R-R Rate</source>
         <translation type="unfinished">R-R интервал</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="358"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="360"/>
         <source>Core Temperature</source>
         <translation>Температура тела</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="362"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="364"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="327"/>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="366"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="368"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
@@ -2492,13 +2625,13 @@ Press Next to Continue
     </message>
     <message>
         <location filename="../../Charts/AllPlotWindow.cpp" line="132"/>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="1020"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="1022"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
         <location filename="../../Charts/AllPlotWindow.cpp" line="133"/>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="1020"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="1022"/>
         <source>Formula</source>
         <translation>Формула</translation>
     </message>
@@ -2518,143 +2651,143 @@ Press Next to Continue
         <translation type="unfinished">Опустить</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="370"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="372"/>
         <source>Altitude</source>
         <translation>Высота</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="374"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="376"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="378"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="380"/>
         <source>Headwind</source>
         <translation>Встречный ветер</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="382"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="384"/>
         <source>Torque</source>
         <translation>Крутящий момент</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="386"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="388"/>
         <source>Gear Ratio</source>
         <translation>Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="390"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="392"/>
         <source>Slope</source>
         <translation>Наклон</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="397"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="399"/>
         <source>No Alt/Slope</source>
         <translation>Без высоты/наклона</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="398"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="400"/>
         <source>0.1km|mi -  1min</source>
         <translation>0,1км|миля - 1 мин</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="399"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="401"/>
         <source>0.5km|mi -  5min</source>
         <translation>0,5км|миля - 5 мин</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="400"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="402"/>
         <source>1.0km|mi - 10min</source>
         <translation>1км|миля - 10 мин</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="401"/>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="1530"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="403"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="1532"/>
         <source>Alt/Slope</source>
         <translation>Высота/Наклон</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="406"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="408"/>
         <source>Anaerobic TISS</source>
         <translation>Анаэробный TISS</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="408"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="410"/>
         <source>Metrics</source>
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="410"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="412"/>
         <source>Aerobic TISS</source>
         <translation>Аэробный TISS</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="414"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="416"/>
         <source>Iso Power</source>
         <translation>Нормированная мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="418"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="420"/>
         <source>Skiba xPower</source>
         <translation type="unfinished">xPower Скиба</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="422"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="424"/>
         <source>Altitude Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="426"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="428"/>
         <source>W&apos; balance</source>
         <translation>Баланс W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="440"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="442"/>
         <source>Time of day</source>
         <translation>Время суток</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="746"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="748"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="2255"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="2257"/>
         <source>Selection #%1 </source>
         <translation>Выделение #%1 </translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="431"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="433"/>
         <source>Power + shade</source>
         <translation>Мощность + зоны</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="432"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="434"/>
         <source>Power - shade</source>
         <translation>Мощность - зоны</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="433"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="435"/>
         <source>No Power</source>
         <translation>Без мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="434"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="436"/>
         <source>Shading</source>
         <translation>На фоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="438"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="440"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="439"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="441"/>
         <source>Distance</source>
         <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Charts/AllPlotWindow.cpp" line="441"/>
+        <location filename="../../Charts/AllPlotWindow.cpp" line="443"/>
         <source>X Axis</source>
         <translation>Ось X</translation>
     </message>
@@ -2662,43 +2795,43 @@ Press Next to Continue
 <context>
     <name>AnalysisSidebar</name>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="54"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="57"/>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="84"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="87"/>
         <source>Activities</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="85"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="136"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="88"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="139"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="135"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="138"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="384"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="388"/>
         <source>Save Changes</source>
         <translation>Сохранить изменения</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="387"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="391"/>
         <source>Revert to Saved version</source>
         <translation>Вернуться к сохранённому</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="390"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="394"/>
         <source>Delete Activity</source>
         <translation>Удалить тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="393"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="397"/>
         <source>Split Activity</source>
         <translation>Разделить тренировку</translation>
     </message>
@@ -2707,124 +2840,139 @@ Press Next to Continue
         <translation type="vanished">Загрузить тренировку в календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="410"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="414"/>
         <source>Show Column Chooser</source>
         <translation>Показать выбор столбцов</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="417"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="421"/>
         <source>Do Not Show In Groups</source>
         <translation>Не показывать в группах</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="423"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="427"/>
         <source>Group By</source>
         <translation>Сгруппировать по</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="444"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="448"/>
         <source>Expand All</source>
         <translation>Развернуть все</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="449"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="453"/>
         <source>Collapse All</source>
         <translation>Свернуть все</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="454"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="458"/>
         <source>Reset to default</source>
         <translation>Вернуть исходные параметры</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="480"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="484"/>
         <source>Sort User Intervals</source>
         <translation>Отсортировать пользовательские интервалы</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="583"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="571"/>
+        <source>Mark as a performance test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="595"/>
         <source>Rename route</source>
         <translation>Переименовать маршрут</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="588"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="600"/>
         <source>Stop tracking this segment</source>
         <translation>Прекратить отслеживание этого участка</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="606"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="617"/>
+        <source>Create a performance test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="625"/>
         <source>Create a route segment</source>
         <translation>Создать участок маршрута</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="631"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="650"/>
         <source>No activity selected</source>
         <translation>Тренировка не выбрана</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="633"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="652"/>
         <source>Current activity contains no data</source>
         <translation>В открытой тренировке нет данных</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="763"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="730"/>
+        <source>Performance Test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="825"/>
         <source>Delete Interval</source>
         <translation>Удалить интервал</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="763"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="825"/>
         <source>Unable to delete interval</source>
         <translation>Невозможно удалить интервал</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="404"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="474"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="408"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="478"/>
         <source>Find Intervals...</source>
         <translation>Найти интервалы...</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="488"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="492"/>
         <source>Zoom out</source>
         <translation>Отдалить просмотр</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="495"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="552"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="499"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="556"/>
         <source>Zoom to interval</source>
         <translation>Интервал на весь экран</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="503"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="561"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="507"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="565"/>
         <source>Edit interval</source>
         <translation>Изменить интервал</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="504"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="562"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="508"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="576"/>
         <source>Delete interval</source>
         <translation>Удалить интервал</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="514"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="572"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="518"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="584"/>
         <source>Rename selected intervals</source>
         <translation>Переименовать выбранные интервалы</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="516"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="574"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="520"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="586"/>
         <source>Delete selected intervals</source>
         <translation>Удалить выбранные интервалы</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="551"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="555"/>
         <source>Zoom Out</source>
         <translation>Отдалить просмотр</translation>
     </message>
     <message>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="631"/>
-        <location filename="../../Gui/AnalysisSidebar.cpp" line="633"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="650"/>
+        <location filename="../../Gui/AnalysisSidebar.cpp" line="652"/>
         <source>Find Intervals</source>
         <translation>Найти интервалы</translation>
     </message>
@@ -2899,7 +3047,7 @@ Press Next to Continue
 <context>
     <name>AppendXDataPointsCommand</name>
     <message>
-        <location filename="../../FileIO/RideFileCommand.cpp" line="720"/>
+        <location filename="../../FileIO/RideFileCommand.cpp" line="724"/>
         <source>Append XData Points</source>
         <translation type="unfinished">Добавить точки XData</translation>
     </message>
@@ -2907,77 +3055,77 @@ Press Next to Continue
 <context>
     <name>Athlete</name>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="143"/>
+        <location filename="../../Core/Athlete.cpp" line="145"/>
         <source>Pace Zones File %1 Error</source>
         <translation>Ошибка в файле зон темпа %1</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="302"/>
+        <location filename="../../Core/Athlete.cpp" line="303"/>
         <source>Athlete Weight</source>
         <translation>Вес спортсмена</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="306"/>
+        <location filename="../../Core/Athlete.cpp" line="307"/>
         <source>Time In HR Zone</source>
         <translation>Время в зоне ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="307"/>
+        <location filename="../../Core/Athlete.cpp" line="308"/>
         <source>Power Distribution</source>
         <translation>Распределение мощности</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="308"/>
+        <location filename="../../Core/Athlete.cpp" line="309"/>
         <source>Vo2max Estimation</source>
         <translation>Оценка VO₂ макс</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="309"/>
+        <location filename="../../Core/Athlete.cpp" line="310"/>
         <source>KPI Tracker</source>
         <translation>Контроль за показателями</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="310"/>
+        <location filename="../../Core/Athlete.cpp" line="311"/>
         <source>Critical Power Trend</source>
         <translation>Динамика критической мощности</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="311"/>
+        <location filename="../../Core/Athlete.cpp" line="312"/>
         <source>Aerobic Power</source>
         <translation>Аэробная мощность</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="312"/>
+        <location filename="../../Core/Athlete.cpp" line="313"/>
         <source>Power Variance</source>
         <translation>Колебания мощности</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="313"/>
+        <location filename="../../Core/Athlete.cpp" line="314"/>
         <source>Power Profile</source>
         <translation>Профиль мощности</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="314"/>
+        <location filename="../../Core/Athlete.cpp" line="315"/>
         <source>Anaerobic Power</source>
         <translation>Анаэробная мощность</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="315"/>
+        <location filename="../../Core/Athlete.cpp" line="316"/>
         <source>Power &amp; Speed Trend</source>
         <translation>Динамика мощности и скорости</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="316"/>
+        <location filename="../../Core/Athlete.cpp" line="317"/>
         <source>Tempo &amp; Threshold Time</source>
         <translation>Темп и Пороговое время</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="317"/>
+        <location filename="../../Core/Athlete.cpp" line="318"/>
         <source>Training Mix</source>
         <translation>Тренировочный микс</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="318"/>
+        <location filename="../../Core/Athlete.cpp" line="319"/>
         <source>Time &amp; Distance</source>
         <translation>Время и дистанция</translation>
     </message>
@@ -2986,127 +3134,131 @@ Press Next to Continue
         <translation type="obsolete">Вес по Withings</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="105"/>
+        <location filename="../../Core/Athlete.cpp" line="107"/>
         <source>Zones File %1 Error</source>
         <translation>Ошибка в файле зон %1</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="107"/>
+        <location filename="../../Core/Athlete.cpp" line="109"/>
         <source>Reading Zones File %1</source>
         <translation>Чтение зон из файла %1</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="124"/>
+        <location filename="../../Core/Athlete.cpp" line="126"/>
         <source>HR Zones File %1 Error</source>
         <translation>Ошибка в файле зон ЧСС %1</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="126"/>
+        <location filename="../../Core/Athlete.cpp" line="128"/>
         <source>Reading HR Zones File %1</source>
         <translation>Чтение зон ЧСС из файла %1</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="303"/>
+        <location filename="../../Core/Athlete.cpp" line="304"/>
         <source>Time In Power Zone</source>
         <translation>Время в зоне мощности</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="304"/>
+        <location filename="../../Core/Athlete.cpp" line="305"/>
         <source>Sustained Time In Zone</source>
         <translation>Время в зоне близкой к модели</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="305"/>
+        <location filename="../../Core/Athlete.cpp" line="306"/>
         <source>Time in W&apos; Zone</source>
         <translation>Время в зоне W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="319"/>
+        <location filename="../../Core/Athlete.cpp" line="320"/>
         <source>BikeScore and Intensity</source>
         <translation>BikeScore и Интенсивность</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="320"/>
         <source>BikeStress and IF</source>
-        <translation>BikeStress и IF</translation>
+        <translation type="vanished">BikeStress и IF</translation>
     </message>
     <message>
         <location filename="../../Core/Athlete.cpp" line="321"/>
+        <source>BikeStress and BikeIntensity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Athlete.cpp" line="322"/>
         <source>Stress and Distance</source>
         <translation>Нагрузка и дистанция</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="322"/>
+        <location filename="../../Core/Athlete.cpp" line="323"/>
         <source>Calories vs Duration</source>
         <translation>Калории vs длительность</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="323"/>
+        <location filename="../../Core/Athlete.cpp" line="324"/>
         <source>Stress (TISS)</source>
         <translation>Нагрузка (TISS)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="324"/>
+        <location filename="../../Core/Athlete.cpp" line="325"/>
         <source>Aerobic Response</source>
         <translation>Аэробный отклик</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="325"/>
+        <location filename="../../Core/Athlete.cpp" line="326"/>
         <source>Anaerobic Response</source>
         <translation>Анаэробный отклик</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="326"/>
+        <location filename="../../Core/Athlete.cpp" line="327"/>
         <source>PMC (Coggan)</source>
         <translation>PMC (по Коггану)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="327"/>
+        <location filename="../../Core/Athlete.cpp" line="328"/>
         <source>PMC (Skiba)</source>
         <translation>PMC (по Скибе)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="328"/>
+        <location filename="../../Core/Athlete.cpp" line="329"/>
         <source>PMC (TRIMP)</source>
         <translation>PMC (TRIMP)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="329"/>
+        <location filename="../../Core/Athlete.cpp" line="330"/>
         <source>PMC (Distance)</source>
         <translation>PMC (дистанция)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="330"/>
+        <location filename="../../Core/Athlete.cpp" line="331"/>
         <source>PMC (Duration)</source>
         <translation>PMC (длительность)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="331"/>
+        <location filename="../../Core/Athlete.cpp" line="332"/>
         <source>CP History</source>
         <translation>История CP</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="332"/>
+        <location filename="../../Core/Athlete.cpp" line="333"/>
         <source>CP Analysis</source>
         <translation>Анализ CP</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="333"/>
+        <location filename="../../Core/Athlete.cpp" line="334"/>
         <source>PMC (TriScore)</source>
         <translation>PMC (TriScore)</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="334"/>
+        <location filename="../../Core/Athlete.cpp" line="335"/>
         <source>Time in Pace Zones</source>
         <translation>Время в зонах темпа</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="335"/>
+        <location filename="../../Core/Athlete.cpp" line="336"/>
         <source>Run Pace</source>
         <translation>Темп бега</translation>
     </message>
     <message>
-        <location filename="../../Core/Athlete.cpp" line="336"/>
+        <location filename="../../Core/Athlete.cpp" line="337"/>
         <source>Swim Pace</source>
         <translation>Темп плавания</translation>
     </message>
@@ -3193,57 +3345,89 @@ Press Next to Continue
         <translation>Добавление файлов в резервную копию %1 для спорстмена %2 ...</translation>
     </message>
 </context>
+<context>
+    <name>AthleteBones</name>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="606"/>
+        <source>Athlete Bones</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="608"/>
+        <source>kg</source>
+        <translation type="unfinished">кг</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="609"/>
+        <source>lbs</source>
+        <translation type="unfinished">фнт</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="612"/>
+        <source>Athlete bones in kg or lbs from body measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>AthleteConfig</name>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="341"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="350"/>
         <source>About</source>
         <translation>О спортсмене</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="343"/>
         <source>Measures</source>
-        <translation>Метрики</translation>
+        <translation type="vanished">Метрики</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="336"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="345"/>
         <source>Power Zones</source>
         <translation>Зоны мощности</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="337"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="346"/>
         <source>Heartrate Zones</source>
         <translation>Зоны ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="338"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="347"/>
         <source>Pace Zones</source>
         <translation>Зоны темпа</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="342"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="351"/>
         <source>Model</source>
-        <translation type="unfinished">Модель</translation>
+        <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="344"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="352"/>
+        <source>Measurements</source>
+        <translation>Измерения</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/ConfigDialog.cpp" line="353"/>
+        <source>HRV</source>
+        <translation>HRV</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/ConfigDialog.cpp" line="354"/>
         <source>Zones</source>
-        <translation type="unfinished"></translation>
+        <translation>Зоны</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="345"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="355"/>
         <source>Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation>Аккаунты</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="346"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="356"/>
         <source>Auto Import</source>
         <translation>Автоимпорт</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="347"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="357"/>
         <source>Backup</source>
-        <translation type="unfinished"></translation>
+        <translation>Архивирование</translation>
     </message>
 </context>
 <context>
@@ -3265,8 +3449,12 @@ Press Next to Continue
     </message>
     <message>
         <location filename="../../Metrics/BasicRideMetrics.cpp" line="575"/>
+        <source>Athlete bodyfat in kg or lbs from body measurements</source>
+        <translation type="unfinished">Доля жира в кг или фунтах в массе спорстмена</translation>
+    </message>
+    <message>
         <source>Bodyfat in kg or lbs from downloaded Body Measure data</source>
-        <translation type="unfinished">Доля жира в кг или фнт в массе спорстмена</translation>
+        <translation type="obsolete">Доля жира в кг или фнт в массе спорстмена</translation>
     </message>
     <message>
         <source>Bodyfat in kg or lbs from Withings data</source>
@@ -3276,21 +3464,25 @@ Press Next to Continue
 <context>
     <name>AthleteFatP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="651"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="714"/>
         <source>Athlete Bodyfat Percent</source>
-        <translation>Доля жира в массе спортсмена</translation>
+        <translation type="unfinished">Процент жира в массе спортсмена</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="653"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="654"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="716"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="717"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="656"/>
-        <source>Bodyfat Percent from downloaded Body Measure data</source>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="719"/>
+        <source>Bodyfat in Percent from body measurements</source>
         <translation type="unfinished">Доля жира в процентах в массе спорстмена</translation>
     </message>
+    <message>
+        <source>Bodyfat Percent from downloaded Body Measure data</source>
+        <translation type="obsolete">Доля жира в процентах в массе спорстмена</translation>
+    </message>
     <message>
         <source>Bodyfat Percent from Withings data</source>
         <translation type="vanished">Доля жира в процентах в массе спорстмена</translation>
@@ -3299,30 +3491,57 @@ Press Next to Continue
 <context>
     <name>AthleteLean</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="610"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="678"/>
         <source>Athlete Lean Weight</source>
         <translation>Доля нежировой массы</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="612"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="680"/>
         <source>kg</source>
         <translation>кг</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="613"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="681"/>
         <source>lbs</source>
         <translation>фнт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="616"/>
-        <source>Lean Weight in kg or lbs from downloaded Body Measure data</source>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="684"/>
+        <source>Lean Weight in kg or lbs from body measurements</source>
         <translation type="unfinished">Нежировая масса в кг или фунтах</translation>
     </message>
+    <message>
+        <source>Lean Weight in kg or lbs from downloaded Body Measure data</source>
+        <translation type="obsolete">Нежировая масса в кг или фунтах</translation>
+    </message>
     <message>
         <source>Lean Weight in kg or lbs from Withings data</source>
         <translation type="vanished">Нежировая масса в кг или фунтах по данным Withings</translation>
     </message>
 </context>
+<context>
+    <name>AthleteMuscles</name>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="642"/>
+        <source>Athlete Muscles</source>
+        <translation type="unfinished">Мышечная масса</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="644"/>
+        <source>kg</source>
+        <translation type="unfinished">кг</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="645"/>
+        <source>lbs</source>
+        <translation type="unfinished">фнт</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="648"/>
+        <source>Athlete muscles in kg or lbs from body measurements</source>
+        <translation type="unfinished">Мышечная масса в кг или фунтах в массе спортсмена</translation>
+    </message>
+</context>
 <context>
     <name>AthleteWeight</name>
     <message>
@@ -3342,8 +3561,12 @@ Press Next to Continue
     </message>
     <message>
         <location filename="../../Metrics/BasicRideMetrics.cpp" line="526"/>
+        <source>Weight in kg or lbs: first from Athlete body measurements, then from Activity metadata and last from Athlete configuration with 75kg default</source>
+        <translation type="unfinished">Вес в кг или фунтах: вначале из данных измерений тела, потом из метаданных тренировки и в конце из настроек спортсмена, если не указано, тогда 75 кг</translation>
+    </message>
+    <message>
         <source>Weight in kg or lbs: first from downloaded Body Measure data, then from Activity metadata and last from Athlete configuration with 75kg default</source>
-        <translation type="unfinished">Вес в кг или фунтах: вначале из данных Body Measure data, потом из метаданных тренировки и в конце из настроек спортсмена, если не указано, тогда 75 кг</translation>
+        <translation type="obsolete">Вес в кг или фунтах: вначале из данных Body Measure data, потом из метаданных тренировки и в конце из настроек спортсмена, если не указано, тогда 75 кг</translation>
     </message>
     <message>
         <source>Weight in kg or lbs: first from Withings data, then from Activity metadata and last from Athlete configuration with 75kg default</source>
@@ -3353,52 +3576,52 @@ Press Next to Continue
 <context>
     <name>AutoImportPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6051"/>
+        <location filename="../../Gui/Pages.cpp" line="6587"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6052"/>
+        <location filename="../../Gui/Pages.cpp" line="6588"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6053"/>
+        <location filename="../../Gui/Pages.cpp" line="6589"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6064"/>
+        <location filename="../../Gui/Pages.cpp" line="6600"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6065"/>
+        <location filename="../../Gui/Pages.cpp" line="6601"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6066"/>
+        <location filename="../../Gui/Pages.cpp" line="6602"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6067"/>
+        <location filename="../../Gui/Pages.cpp" line="6603"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6080"/>
+        <location filename="../../Gui/Pages.cpp" line="6616"/>
         <source>Directory</source>
         <translation>Каталог</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6081"/>
+        <location filename="../../Gui/Pages.cpp" line="6617"/>
         <source>Import Rule</source>
         <translation>Правило импорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6174"/>
+        <location filename="../../Gui/Pages.cpp" line="6710"/>
         <source>Enter directory or press [Browse] to select</source>
         <translation>Укажите каталог или нажмите «Обзор» для выбора</translation>
     </message>
@@ -3433,18 +3656,18 @@ Press Next to Continue
 <context>
     <name>AvgCadence</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1623"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1681"/>
         <source>Average Cadence</source>
         <translation>Средний каденс</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1624"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1625"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1682"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1683"/>
         <source>rpm</source>
         <translation>об/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1627"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1685"/>
         <source>Average Cadence, computed when Cadence &gt; 0</source>
         <translation>Средний каденс, отличный от нуля</translation>
     </message>
@@ -3452,18 +3675,18 @@ Press Next to Continue
 <context>
     <name>AvgCoreTemp</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1269"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1327"/>
         <source>Average Core Temperature</source>
         <translation>Средняя температура тела</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1270"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1271"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1328"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1329"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1273"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1331"/>
         <source>Average Core Temperature. The core body temperature estimate is based on HR data</source>
         <translation>Средняя температура тела, оценивается по ЧСС</translation>
     </message>
@@ -3471,18 +3694,18 @@ Press Next to Continue
 <context>
     <name>AvgHeartRate</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1215"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1273"/>
         <source>Average Heart Rate</source>
         <translation>Средняя ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1216"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1217"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1274"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1275"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1219"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1277"/>
         <source>Average Heart Rate computed for samples when hr is greater than zero</source>
         <translation>Средняя ЧСС, посчитанная для значений где ЧСС больше нуля</translation>
     </message>
@@ -3490,22 +3713,22 @@ Press Next to Continue
 <context>
     <name>AvgLPCO</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2889"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2947"/>
         <source>Average Left Pedal Center Offset</source>
         <translation>Среднее смещение от центра оси левой педали</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2890"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2948"/>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2891"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2949"/>
         <source>in</source>
         <translation>дюйм</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2895"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2953"/>
         <source>Platform center offset is the location on the left pedal platform where you apply force, on average.</source>
         <translation>Смещение от центра оси - это то место на платформе левой педали, куда вы усреднённо прикладываете силу.</translation>
     </message>
@@ -3513,17 +3736,17 @@ Press Next to Continue
 <context>
     <name>AvgLPP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3423"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3481"/>
         <source>Average Left Power Phase Length</source>
         <translation>Средняя длительность фазы мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3424"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3482"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3427"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3485"/>
         <source>It is the left pedal stroke region length where you produce positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3531,17 +3754,17 @@ Press Next to Continue
 <context>
     <name>AvgLPPB</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2998"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3056"/>
         <source>Average Left Power Phase Start</source>
         <translation>Среднее начало фазы мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2999"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3057"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3002"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3060"/>
         <source>It is the left pedal stroke angle where you start producing positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3549,17 +3772,17 @@ Press Next to Continue
 <context>
     <name>AvgLPPE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3104"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3162"/>
         <source>Average Left Power Phase End</source>
         <translation>Средний конец фазы мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3105"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3163"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3108"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3166"/>
         <source>It is the left pedal stroke angle where you end producing positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3567,17 +3790,17 @@ Press Next to Continue
 <context>
     <name>AvgLPPP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3513"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3571"/>
         <source>Average Left Peak Power Phase Length</source>
         <translation>Средняя длительность фазы пика мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3514"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3572"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3517"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3575"/>
         <source>It is the left pedal stroke region length where you produce peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3585,17 +3808,17 @@ Press Next to Continue
 <context>
     <name>AvgLPPPB</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3209"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3267"/>
         <source>Average Left Peak Power Phase Start</source>
         <translation>Среднее начало фазы пика мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3210"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3268"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3213"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3271"/>
         <source>It is the left pedal stroke angle where you start producing peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3603,17 +3826,17 @@ Press Next to Continue
 <context>
     <name>AvgLPPPE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3316"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3374"/>
         <source>Average Left Peak Power Phase End</source>
         <translation>Средний конец фазы пика мощности слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3317"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3375"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3320"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3378"/>
         <source>It is the left pedal stroke angle where you end producing peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3621,18 +3844,18 @@ Press Next to Continue
 <context>
     <name>AvgLPS</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2782"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2840"/>
         <source>Average Left Pedal Smoothness</source>
         <translation>Средняя плавность педалирования слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2783"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2784"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2841"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2842"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2787"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2845"/>
         <source>It measures how smoothly power is delivered to the left pedal throughout the revolution, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3640,18 +3863,18 @@ Press Next to Continue
 <context>
     <name>AvgLTE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2673"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2731"/>
         <source>Average Left Torque Effectiveness</source>
         <translation>Средняя эффективность крутящего момента слева</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2674"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2675"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2732"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2733"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2678"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2736"/>
         <source>It measures how much of the power delivered to the left pedal is pushing it forward, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3659,18 +3882,18 @@ Press Next to Continue
 <context>
     <name>AvgPower</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="938"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="996"/>
         <source>Average Power</source>
         <translation>Средняя мощность</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="939"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="940"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="997"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="998"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="942"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1000"/>
         <source>Average Power from all samples with power greater than or equal to zero</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3678,22 +3901,22 @@ Press Next to Continue
 <context>
     <name>AvgRPCO</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2944"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3002"/>
         <source>Average Right Pedal Center Offset</source>
         <translation>Среднее смещение от центра оси правой педали</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2945"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3003"/>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2946"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3004"/>
         <source>in</source>
         <translation>дюйм</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2950"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3008"/>
         <source>Platform center offset is the location on the right pedal platform where you apply force, on average.</source>
         <translation>Смещение от центра оси - это то место на платформе правой педали, куда вы усреднённо прикладываете силу.</translation>
     </message>
@@ -3701,17 +3924,17 @@ Press Next to Continue
 <context>
     <name>AvgRPP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3469"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3527"/>
         <source>Average Right Power Phase Length</source>
         <translation>Средняя длительность фазы мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3470"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3528"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3473"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3531"/>
         <source>It is the right pedal stroke region length where you produce positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3719,17 +3942,17 @@ Press Next to Continue
 <context>
     <name>AvgRPPE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3156"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3214"/>
         <source>Average Right Power Phase End</source>
         <translation>Средний конец фазы мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3157"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3215"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3160"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3218"/>
         <source>It is the right pedal stroke angle where you end producing positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3737,17 +3960,17 @@ Press Next to Continue
 <context>
     <name>AvgRPPP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3559"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3617"/>
         <source>Average Right Peak Power Phase Length</source>
         <translation>Средняя длительность фазы пика мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3560"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3618"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3563"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3621"/>
         <source>It is the right pedal stroke region length where you produce peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3755,17 +3978,17 @@ Press Next to Continue
 <context>
     <name>AvgRPPPB</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3262"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3320"/>
         <source>Average Right Peak Power Phase Start</source>
         <translation>Среднее начало фазы пика мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3263"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3321"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3266"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3324"/>
         <source>It is the right pedal stroke angle where you start producing peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3773,17 +3996,17 @@ Press Next to Continue
 <context>
     <name>AvgRPPPE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3368"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3426"/>
         <source>Average Right Peak Power Phase End</source>
         <translation>Средний конец фазы пика мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3369"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3427"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3372"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3430"/>
         <source>It is the right pedal stroke angle where you end producing peak power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3791,18 +4014,18 @@ Press Next to Continue
 <context>
     <name>AvgRPS</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2836"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2894"/>
         <source>Average Right Pedal Smoothness</source>
         <translation>Средняя плавность педалирования справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2837"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2838"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2895"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2896"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2841"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2899"/>
         <source>It measures how smoothly power is delivered to the right pedal throughout the revolution, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3810,18 +4033,18 @@ Press Next to Continue
 <context>
     <name>AvgRTE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2728"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2786"/>
         <source>Average Right Torque Effectiveness</source>
         <translation>Средняя эффективность крутящего момента справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2729"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2730"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2787"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2788"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2733"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2791"/>
         <source>It measures how much of the power delivered to the right pedal is pushing it forward, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3829,17 +4052,17 @@ Press Next to Continue
 <context>
     <name>AvgRTPP</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3050"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3108"/>
         <source>Average Right Power Phase Start</source>
         <translation>Среднее начало фазы мощности справа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3051"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3109"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3054"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3112"/>
         <source>It is the right pedal stroke angle where you start producing positive power, on average.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3869,13 +4092,13 @@ Press Next to Continue
         <location filename="../../Metrics/RunMetrics.cpp" line="158"/>
         <location filename="../../Metrics/RunMetrics.cpp" line="162"/>
         <source>Average Ground Contact Time</source>
-        <translation type="unfinished">Среднее время контакта с землёй</translation>
+        <translation>Среднее время контакта с землёй</translation>
     </message>
     <message>
         <location filename="../../Metrics/RunMetrics.cpp" line="159"/>
         <location filename="../../Metrics/RunMetrics.cpp" line="160"/>
         <source>ms</source>
-        <translation type="unfinished">мс</translation>
+        <translation>мс</translation>
     </message>
 </context>
 <context>
@@ -3900,18 +4123,18 @@ Press Next to Continue
 <context>
     <name>AvgSmO2</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="994"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1052"/>
         <source>Average SmO2</source>
         <translation>SmO₂ среднее</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="995"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="996"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1053"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1054"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="998"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1056"/>
         <source>Average Muscle Oxygen Saturation, the percentage of hemoglobin that is carrying oxygen.</source>
         <translation>Среднее насыщение мышц кислородом выражается как процент насыщения гемоглобина, учавствующего в переносе кислорода.</translation>
     </message>
@@ -3919,22 +4142,22 @@ Press Next to Continue
 <context>
     <name>AvgSpeed</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="877"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="935"/>
         <source>Average Speed</source>
         <translation>Средняя скорость</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="878"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="936"/>
         <source>kph</source>
         <translation>км/ч</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="879"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="937"/>
         <source>mph</source>
         <translation>миль/ч</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="883"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="941"/>
         <source>Average Speed in kph or mph, computed from distance over time when speed not zero</source>
         <translation>Средняя скорость в км/ч или миль/ч, расчитывается из расстояния пройденного за время, для значений когда скорость не равна нулю</translation>
     </message>
@@ -3961,22 +4184,22 @@ Press Next to Continue
 <context>
     <name>AvgTemp</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1688"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1746"/>
         <source>Average Temp</source>
         <translation>Средняя температура</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1689"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1747"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1690"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1748"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1695"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1753"/>
         <source>Average Temp from activity data</source>
         <translation>Средняя температура по данным тренировки</translation>
     </message>
@@ -3984,18 +4207,18 @@ Press Next to Continue
 <context>
     <name>AvgtHb</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1049"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1107"/>
         <source>Average tHb</source>
         <translation>Среднее tHb</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1050"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1051"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1108"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1109"/>
         <source>g/dL</source>
         <translation>г/дл</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1054"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1112"/>
         <source>Average total hemoglobin concentration. The total grams of hemoglobin per deciliter.</source>
         <translation>Средняя общая концентрация гемоглобина. Общее количество гемоглобина в грамах на децилитр.</translation>
     </message>
@@ -4010,29 +4233,29 @@ Press Next to Continue
 <context>
     <name>BackupPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="809"/>
+        <location filename="../../Gui/Pages.cpp" line="898"/>
         <source>Auto Backup Folder</source>
-        <translation type="unfinished">Папка для авторезервирования</translation>
+        <translation>Папка для авторезервирования</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="812"/>
+        <location filename="../../Gui/Pages.cpp" line="901"/>
         <source>Browse</source>
-        <translation type="unfinished">Обзор</translation>
+        <translation>Обзор</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="818"/>
+        <location filename="../../Gui/Pages.cpp" line="907"/>
         <source>Auto Backup execution every</source>
-        <translation type="unfinished">Выполнять резервирование каждые</translation>
+        <translation>Выполнять резервирование каждые</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="820"/>
+        <location filename="../../Gui/Pages.cpp" line="909"/>
         <source>times the athlete is closed - 0 means never</source>
-        <translation type="unfinished">раз, когда аккаунт атлета был закрыт. 0 = никогда</translation>
+        <translation>раз, когда аккаунт атлета был закрыт. 0 = никогда</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="843"/>
+        <location filename="../../Gui/Pages.cpp" line="932"/>
         <source>Choose Backup Directory</source>
-        <translation type="unfinished">Выберите каталог хранения резервных копий</translation>
+        <translation>Выберите каталог хранения резервных копий</translation>
     </message>
 </context>
 <context>
@@ -4579,22 +4802,22 @@ Press Next to Continue
 <context>
     <name>BestsMetricsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2218"/>
+        <location filename="../../Gui/Pages.cpp" line="2748"/>
         <source>Available Metrics</source>
         <translation>Доступные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2223"/>
+        <location filename="../../Gui/Pages.cpp" line="2753"/>
         <source>Selected Metrics</source>
         <translation>Выбранные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2239"/>
+        <location filename="../../Gui/Pages.cpp" line="2769"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2240"/>
+        <location filename="../../Gui/Pages.cpp" line="2770"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
@@ -4607,6 +4830,14 @@ Press Next to Continue
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>BikeStress</name>
+    <message>
+        <location filename="../../Metrics/Coggan.cpp" line="225"/>
+        <source>Training Stress Score takes into account both the intensity and the duration of the training session, it can be computed as 100 * hours * IF^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>BingMap</name>
     <message>
@@ -4782,16 +5013,70 @@ Let&apos;s get you setup.</source>
         <translation>Скачать тренировки</translation>
     </message>
 </context>
+<context>
+    <name>BodyMeasures</name>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Weight</source>
+        <translation>Вес</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Fat Mass</source>
+        <translation>Жировая масса</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Muscle Mass</source>
+        <translation>Мышечная масса</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Bones Mass</source>
+        <translation>Костная масса</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Lean Mass</source>
+        <translation>Нежировая масса</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="187"/>
+        <source>Fat Percent</source>
+        <translation>Процент жира</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="209"/>
+        <source>kg</source>
+        <translation>кг</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="209"/>
+        <location filename="../../Core/BodyMeasures.cpp" line="210"/>
+        <source>%</source>
+        <translation>%</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="210"/>
+        <source>lbs</source>
+        <translation>фнт</translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.h" line="73"/>
+        <source>Body</source>
+        <translation type="unfinished">Тело</translation>
+    </message>
+</context>
 <context>
     <name>BodyMeasuresCsvImport</name>
     <message>
         <location filename="../../FileIO/BodyMeasuresCsvImport.cpp" line="45"/>
-        <source>Select body measures file to import</source>
+        <source>CSV Files (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../FileIO/BodyMeasuresCsvImport.cpp" line="45"/>
-        <source>CSV Files (*.csv)</source>
+        <source>Select body measurements file to import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4836,7 +5121,7 @@ Let&apos;s get you setup.</source>
     </message>
     <message>
         <location filename="../../FileIO/BodyMeasuresCsvImport.cpp" line="109"/>
-        <source>Number of data columns: %1 in line %2 deviates from header columns: %2</source>
+        <source>Number of data columns: %1 in line %2 deviates from header columns: %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4882,20 +5167,24 @@ Let&apos;s get you setup.</source>
 </context>
 <context>
     <name>BodyMeasuresDownload</name>
-    <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="33"/>
-        <source>Body Measures download</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="39"/>
         <source>Choose the download or import source</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="40"/>
         <source>Withings</source>
-        <translation type="unfinished">Withings</translation>
+        <translation type="obsolete">Withings</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="33"/>
+        <source>Body Measurements download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="40"/>
+        <source>Nokia Health (Withings)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="41"/>
@@ -4919,7 +5208,28 @@ Let&apos;s get you setup.</source>
     </message>
     <message>
         <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="52"/>
-        <source>From date of last downloaded measure to today</source>
+        <source>From date of last downloaded measurement to today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="79"/>
+        <source>Discard all existing measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="233"/>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="316"/>
+        <source>Body Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="310"/>
+        <source>Download completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="316"/>
+        <source>Downloading of body measurements failed with error: %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4928,36 +5238,20 @@ Let&apos;s get you setup.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="80"/>
-        <source>Discard all existing measures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="92"/>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="91"/>
         <source>Download</source>
         <translation type="unfinished">Скачать</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="93"/>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="92"/>
         <source>Close</source>
         <translation type="unfinished">Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="197"/>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="273"/>
-        <source>Body Measures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="197"/>
+        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="233"/>
         <source>Invalid date range - please check your input</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasuresDownload.cpp" line="273"/>
-        <source>Downloading of body measures failed with error: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>CPExp</name>
@@ -4981,67 +5275,67 @@ Let&apos;s get you setup.</source>
 <context>
     <name>CPPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3810"/>
-        <location filename="../../Gui/Pages.cpp" line="3819"/>
+        <location filename="../../Gui/Pages.cpp" line="4346"/>
+        <location filename="../../Gui/Pages.cpp" line="4355"/>
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3812"/>
-        <location filename="../../Gui/Pages.cpp" line="3825"/>
+        <location filename="../../Gui/Pages.cpp" line="4348"/>
+        <location filename="../../Gui/Pages.cpp" line="4361"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3813"/>
-        <location filename="../../Gui/Pages.cpp" line="3826"/>
+        <location filename="../../Gui/Pages.cpp" line="4349"/>
+        <location filename="../../Gui/Pages.cpp" line="4362"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3818"/>
-        <location filename="../../Gui/Pages.cpp" line="3831"/>
+        <location filename="../../Gui/Pages.cpp" line="4354"/>
+        <location filename="../../Gui/Pages.cpp" line="4367"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3820"/>
-        <location filename="../../Gui/Pages.cpp" line="3832"/>
+        <location filename="../../Gui/Pages.cpp" line="4356"/>
+        <location filename="../../Gui/Pages.cpp" line="4368"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3822"/>
+        <location filename="../../Gui/Pages.cpp" line="4358"/>
         <source>Def</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3843"/>
-        <location filename="../../Gui/Pages.cpp" line="3968"/>
+        <location filename="../../Gui/Pages.cpp" line="4379"/>
+        <location filename="../../Gui/Pages.cpp" line="4504"/>
         <source>From Date</source>
         <translation>Дата замера</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3844"/>
-        <location filename="../../Gui/Pages.cpp" line="3970"/>
+        <location filename="../../Gui/Pages.cpp" line="4380"/>
+        <location filename="../../Gui/Pages.cpp" line="4506"/>
         <source>Critical Power</source>
         <translation>Критическая мощность (CP)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3845"/>
-        <location filename="../../Gui/Pages.cpp" line="3972"/>
+        <location filename="../../Gui/Pages.cpp" line="4381"/>
+        <location filename="../../Gui/Pages.cpp" line="4508"/>
         <source>FTP</source>
         <translation>FTP</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3846"/>
-        <location filename="../../Gui/Pages.cpp" line="3975"/>
+        <location filename="../../Gui/Pages.cpp" line="4382"/>
+        <location filename="../../Gui/Pages.cpp" line="4511"/>
         <source>W&apos;</source>
         <translation>W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3847"/>
-        <location filename="../../Gui/Pages.cpp" line="3976"/>
+        <location filename="../../Gui/Pages.cpp" line="4383"/>
+        <location filename="../../Gui/Pages.cpp" line="4512"/>
         <source>Pmax</source>
         <translation>Pmax</translation>
     </message>
@@ -5050,57 +5344,57 @@ Let&apos;s get you setup.</source>
         <translation type="vanished">Использовать CP для FTP</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4001"/>
-        <location filename="../../Gui/Pages.cpp" line="4059"/>
-        <location filename="../../Gui/Pages.cpp" line="4107"/>
+        <location filename="../../Gui/Pages.cpp" line="4537"/>
+        <location filename="../../Gui/Pages.cpp" line="4595"/>
+        <location filename="../../Gui/Pages.cpp" line="4643"/>
         <source>MMM d, yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3912"/>
+        <location filename="../../Gui/Pages.cpp" line="4448"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3854"/>
+        <location filename="../../Gui/Pages.cpp" line="4390"/>
         <source>Use CP for all metrics</source>
         <translation>Использовать CP для всех метрик</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3855"/>
+        <location filename="../../Gui/Pages.cpp" line="4391"/>
         <source>Use FTP for Coggan metrics</source>
         <translation>Использовать FTP для метрик Coggan</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3913"/>
+        <location filename="../../Gui/Pages.cpp" line="4449"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3914"/>
+        <location filename="../../Gui/Pages.cpp" line="4450"/>
         <source>From Watts</source>
         <translation>От ватт</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4037"/>
-        <location filename="../../Gui/Pages.cpp" line="4087"/>
+        <location filename="../../Gui/Pages.cpp" line="4573"/>
+        <location filename="../../Gui/Pages.cpp" line="4623"/>
         <source>CP must be &gt; 0</source>
         <translation>CP должна быть &gt; 0 </translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4264"/>
+        <location filename="../../Gui/Pages.cpp" line="4800"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4289"/>
-        <location filename="../../Gui/Pages.cpp" line="4296"/>
+        <location filename="../../Gui/Pages.cpp" line="4825"/>
+        <location filename="../../Gui/Pages.cpp" line="4832"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4291"/>
-        <location filename="../../Gui/Pages.cpp" line="4298"/>
+        <location filename="../../Gui/Pages.cpp" line="4827"/>
+        <location filename="../../Gui/Pages.cpp" line="4834"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -5108,310 +5402,290 @@ Let&apos;s get you setup.</source>
 <context>
     <name>CPPlot</name>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="71"/>
-        <location filename="../../Charts/CPPlot.cpp" line="307"/>
+        <location filename="../../Charts/CPPlot.cpp" line="78"/>
+        <location filename="../../Charts/CPPlot.cpp" line="327"/>
         <source>Interval Length</source>
         <translation>Длина интервала</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="85"/>
+        <location filename="../../Charts/CPPlot.cpp" line="92"/>
         <source>Average Power (watts)</source>
         <translation>Средняя мощность (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="95"/>
-        <location filename="../../Charts/CPPlot.cpp" line="1558"/>
-        <location filename="../../Charts/CPPlot.cpp" line="1734"/>
+        <location filename="../../Charts/CPPlot.cpp" line="102"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1919"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2137"/>
         <source>Percent of Best</source>
         <translation>Процент от лучшего</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="193"/>
+        <location filename="../../Charts/CPPlot.cpp" line="209"/>
         <source>Total work</source>
         <translation>Общий расход энергии</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="194"/>
+        <location filename="../../Charts/CPPlot.cpp" line="210"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1121"/>
         <source>kJ</source>
         <translation>кДж</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="286"/>
+        <location filename="../../Charts/CPPlot.cpp" line="306"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="246"/>
-        <location filename="../../Charts/CPPlot.cpp" line="251"/>
-        <location filename="../../Charts/CPPlot.cpp" line="256"/>
-        <location filename="../../Charts/CPPlot.cpp" line="287"/>
+        <location filename="../../Charts/CPPlot.cpp" line="266"/>
+        <location filename="../../Charts/CPPlot.cpp" line="271"/>
+        <location filename="../../Charts/CPPlot.cpp" line="276"/>
+        <location filename="../../Charts/CPPlot.cpp" line="307"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="187"/>
+        <location filename="../../Charts/CPPlot.cpp" line="203"/>
         <source>Veloclinic Plot</source>
         <translation>график Veloclinic</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="188"/>
+        <location filename="../../Charts/CPPlot.cpp" line="204"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2114"/>
         <source>J</source>
         <translation>Дж</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="199"/>
+        <location filename="../../Charts/CPPlot.cpp" line="215"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="200"/>
+        <location filename="../../Charts/CPPlot.cpp" line="216"/>
         <source>rpm</source>
         <translation>об/мин</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="204"/>
+        <location filename="../../Charts/CPPlot.cpp" line="220"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="205"/>
+        <location filename="../../Charts/CPPlot.cpp" line="221"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="209"/>
+        <location filename="../../Charts/CPPlot.cpp" line="225"/>
         <source>Watts delta</source>
         <translation>Дельта мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="210"/>
+        <location filename="../../Charts/CPPlot.cpp" line="226"/>
         <source>watts/s</source>
         <translation>Вт/с</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="214"/>
+        <location filename="../../Charts/CPPlot.cpp" line="230"/>
         <source>Cadence delta</source>
         <translation>Дельта каденса</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="215"/>
+        <location filename="../../Charts/CPPlot.cpp" line="231"/>
         <source>rpm/s</source>
         <translation>об/с</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="219"/>
+        <location filename="../../Charts/CPPlot.cpp" line="235"/>
         <source>Torque delta</source>
         <translation>Дельта крутящего момента</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="220"/>
+        <location filename="../../Charts/CPPlot.cpp" line="236"/>
         <source>nm/s</source>
         <translation>нм/с</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="224"/>
+        <location filename="../../Charts/CPPlot.cpp" line="240"/>
         <source>Heartrate delta</source>
         <translation>Дельта ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="225"/>
+        <location filename="../../Charts/CPPlot.cpp" line="241"/>
         <source>bpm/s</source>
         <translation>уд/с</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="229"/>
+        <location filename="../../Charts/CPPlot.cpp" line="245"/>
         <source>Acceleration</source>
         <translation>Ускорение</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="230"/>
+        <location filename="../../Charts/CPPlot.cpp" line="246"/>
         <source>m/s/s</source>
         <translation>м/с/с</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="234"/>
+        <location filename="../../Charts/CPPlot.cpp" line="250"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="235"/>
+        <location filename="../../Charts/CPPlot.cpp" line="251"/>
         <source>kph</source>
         <translation>км/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="240"/>
+        <location filename="../../Charts/CPPlot.cpp" line="260"/>
         <source>Pedal Force</source>
         <translation>Сила педалирования</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="241"/>
+        <location filename="../../Charts/CPPlot.cpp" line="261"/>
         <source>nm</source>
         <translation>нм</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="245"/>
+        <location filename="../../Charts/CPPlot.cpp" line="265"/>
         <source>Iso Power</source>
         <translation>Нормализованная мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="250"/>
+        <location filename="../../Charts/CPPlot.cpp" line="270"/>
         <source>Altitude Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="255"/>
+        <location filename="../../Charts/CPPlot.cpp" line="275"/>
         <source>xPower</source>
         <translation type="unfinished">xPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="261"/>
+        <location filename="../../Charts/CPPlot.cpp" line="281"/>
         <source>Watts per kilogram</source>
         <translation>Ватт на килограмм</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="262"/>
-        <location filename="../../Charts/CPPlot.cpp" line="272"/>
+        <location filename="../../Charts/CPPlot.cpp" line="282"/>
+        <location filename="../../Charts/CPPlot.cpp" line="292"/>
         <source>w/kg</source>
         <translation>Вт/кг</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="264"/>
+        <location filename="../../Charts/CPPlot.cpp" line="284"/>
         <source>Watts per lb</source>
         <translation>Ватт на фунт</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="265"/>
-        <location filename="../../Charts/CPPlot.cpp" line="275"/>
+        <location filename="../../Charts/CPPlot.cpp" line="285"/>
+        <location filename="../../Charts/CPPlot.cpp" line="295"/>
         <source>w/lb</source>
         <translation>Вт/фунт</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="271"/>
+        <location filename="../../Charts/CPPlot.cpp" line="291"/>
         <source>Altitude Power per kilogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="274"/>
+        <location filename="../../Charts/CPPlot.cpp" line="294"/>
         <source>Altitude Power per lb</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="280"/>
+        <location filename="../../Charts/CPPlot.cpp" line="300"/>
         <source>VAM</source>
         <translation type="unfinished">VAM</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="281"/>
+        <location filename="../../Charts/CPPlot.cpp" line="301"/>
         <source>m/hour</source>
         <translation>м/час</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="301"/>
+        <location filename="../../Charts/CPPlot.cpp" line="321"/>
         <source>Power (W)</source>
         <translation>Мощность (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="546"/>
-        <location filename="../../Charts/CPPlot.cpp" line="559"/>
-        <location filename="../../Charts/CPPlot.cpp" line="602"/>
         <source>Rank</source>
-        <translation>Ранг</translation>
+        <translation type="vanished">Ранг</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="549"/>
-        <location filename="../../Charts/CPPlot.cpp" line="605"/>
+        <location filename="../../Charts/CPPlot.cpp" line="743"/>
+        <location filename="../../Charts/CPPlot.cpp" line="779"/>
         <source>W&apos;</source>
         <translation>W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="550"/>
+        <location filename="../../Charts/CPPlot.cpp" line="745"/>
         <source>%1 kJ</source>
         <translation>%1 кДж</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="551"/>
-        <location filename="../../Charts/CPPlot.cpp" line="556"/>
-        <location filename="../../Charts/CPPlot.cpp" line="569"/>
-        <location filename="../../Charts/CPPlot.cpp" line="573"/>
-        <location filename="../../Charts/CPPlot.cpp" line="574"/>
-        <location filename="../../Charts/CPPlot.cpp" line="587"/>
-        <location filename="../../Charts/CPPlot.cpp" line="590"/>
-        <location filename="../../Charts/CPPlot.cpp" line="591"/>
-        <location filename="../../Charts/CPPlot.cpp" line="607"/>
-        <location filename="../../Charts/CPPlot.cpp" line="612"/>
-        <location filename="../../Charts/CPPlot.cpp" line="624"/>
-        <location filename="../../Charts/CPPlot.cpp" line="627"/>
-        <location filename="../../Charts/CPPlot.cpp" line="628"/>
-        <location filename="../../Charts/CPPlot.cpp" line="641"/>
-        <location filename="../../Charts/CPPlot.cpp" line="643"/>
-        <location filename="../../Charts/CPPlot.cpp" line="644"/>
-        <location filename="../../Charts/CPPlot.cpp" line="667"/>
-        <location filename="../../Charts/CPPlot.cpp" line="668"/>
-        <location filename="../../Charts/CPPlot.cpp" line="684"/>
-        <location filename="../../Charts/CPPlot.cpp" line="685"/>
-        <location filename="../../Charts/CPPlot.cpp" line="695"/>
-        <location filename="../../Charts/CPPlot.cpp" line="696"/>
+        <location filename="../../Charts/CPPlot.cpp" line="764"/>
+        <location filename="../../Charts/CPPlot.cpp" line="765"/>
+        <location filename="../../Charts/CPPlot.cpp" line="784"/>
+        <location filename="../../Charts/CPPlot.cpp" line="785"/>
+        <location filename="../../Charts/CPPlot.cpp" line="800"/>
+        <location filename="../../Charts/CPPlot.cpp" line="801"/>
+        <location filename="../../Charts/CPPlot.cpp" line="824"/>
+        <location filename="../../Charts/CPPlot.cpp" line="825"/>
+        <location filename="../../Charts/CPPlot.cpp" line="841"/>
+        <location filename="../../Charts/CPPlot.cpp" line="842"/>
         <source>n/a</source>
         <translation>—</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="554"/>
-        <location filename="../../Charts/CPPlot.cpp" line="610"/>
+        <location filename="../../Charts/CPPlot.cpp" line="753"/>
+        <location filename="../../Charts/CPPlot.cpp" line="789"/>
         <source>CP</source>
         <translation>CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="555"/>
-        <location filename="../../Charts/CPPlot.cpp" line="562"/>
-        <location filename="../../Charts/CPPlot.cpp" line="580"/>
+        <location filename="../../Charts/CPPlot.cpp" line="754"/>
+        <location filename="../../Charts/CPPlot.cpp" line="760"/>
         <source>%1 w</source>
         <translation>%1 Вт</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="560"/>
-        <location filename="../../Charts/CPPlot.cpp" line="615"/>
         <source>FTP</source>
-        <translation>FTP</translation>
+        <translation type="vanished">FTP</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="578"/>
-        <location filename="../../Charts/CPPlot.cpp" line="632"/>
+        <location filename="../../Charts/CPPlot.cpp" line="758"/>
+        <location filename="../../Charts/CPPlot.cpp" line="794"/>
         <source>Pmax</source>
         <translation>Pmax</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="606"/>
+        <location filename="../../Charts/CPPlot.cpp" line="781"/>
         <source>%1 J/kg</source>
         <translation>%1 Дж/кг</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="611"/>
-        <location filename="../../Charts/CPPlot.cpp" line="617"/>
-        <location filename="../../Charts/CPPlot.cpp" line="634"/>
+        <location filename="../../Charts/CPPlot.cpp" line="790"/>
+        <location filename="../../Charts/CPPlot.cpp" line="796"/>
         <source>%1 w/kg</source>
         <translation>%1 Вт/кг</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1723"/>
         <source>kph %1 mph</source>
-        <translation>км/ч %1 миль/ч</translation>
+        <translation type="vanished">км/ч %1 миль/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1752"/>
         <source>
 %1 m %2 yd</source>
-        <translation>
+        <translation type="vanished">
 %1 м %2 ярдов</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1755"/>
         <source>
 %1 km %2 mi</source>
-        <translation>
+        <translation type="vanished">
 %1 км %2 миль</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="2658"/>
+        <location filename="../../Charts/CPPlot.cpp" line="3126"/>
         <source>%1 mi</source>
         <translation>%1 миль</translation>
     </message>
@@ -5420,84 +5694,134 @@ Let&apos;s get you setup.</source>
         <translation type="obsolete">мин/км</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="660"/>
+        <location filename="../../Charts/CPPlot.cpp" line="817"/>
         <source>D&apos;</source>
         <translation>D&apos;</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="2648"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2119"/>
+        <location filename="../../Charts/CPPlot.cpp" line="3116"/>
         <source>%1 mph</source>
         <translation>%1 миль/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="2656"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2156"/>
+        <source>
+%1 m</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="2157"/>
+        <source>
+%1 yd</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="2161"/>
+        <source>
+%1 km</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="2162"/>
+        <source>
+%1 mi</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="3124"/>
         <source>%1 km</source>
         <translation>%1 км</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="663"/>
+        <location filename="../../Charts/CPPlot.cpp" line="820"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2102"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2108"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2113"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2124"/>
         <source>%1 %2</source>
         <translation>%1 %2</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="665"/>
+        <location filename="../../Charts/CPPlot.cpp" line="378"/>
+        <source>Energy/Time </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="414"/>
+        <source>No Model</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="740"/>
+        <location filename="../../Charts/CPPlot.cpp" line="776"/>
+        <source>Percentile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="822"/>
         <source>m</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="665"/>
+        <location filename="../../Charts/CPPlot.cpp" line="822"/>
         <source>yd</source>
         <translation>ярд</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="672"/>
+        <location filename="../../Charts/CPPlot.cpp" line="829"/>
         <source>CV</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="2646"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2109"/>
+        <source>%</source>
+        <translation type="unfinished">%</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CPPlot.cpp" line="2118"/>
+        <location filename="../../Charts/CPPlot.cpp" line="3114"/>
         <source>%1 kph</source>
         <translation>%1 км/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="677"/>
         <source>FTV</source>
-        <translation>FTV</translation>
+        <translation type="vanished">FTV</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="689"/>
+        <location filename="../../Charts/CPPlot.cpp" line="835"/>
         <source>Vmax</source>
         <translation>Vmax</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="737"/>
-        <location filename="../../Charts/CPPlot.cpp" line="1557"/>
+        <location filename="../../Charts/CPPlot.cpp" line="670"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1918"/>
         <source>Percent of Best / Heat Activities</source>
         <translation>Процент от лучшего / Совпадение с тренировками</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="738"/>
-        <location filename="../../Charts/CPPlot.cpp" line="1568"/>
+        <location filename="../../Charts/CPPlot.cpp" line="671"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1929"/>
         <source>Heat Activities</source>
         <translation>Совпадающие тренировки</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1739"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2103"/>
         <source>Activities</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1492"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1853"/>
         <source>ddd MMM d, yyyy hh:mm</source>
         <translation>d MMM yyyy, ddd, hh:mm</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1025"/>
+        <location filename="../../Charts/CPPlot.cpp" line="1260"/>
         <source>Bests</source>
         <translation>Лучшие результаты</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="1706"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2082"/>
         <source>
 ddd, dd MMM yyyy</source>
         <translation>dd MMM yyyy, ddd</translation>
@@ -5507,7 +5831,7 @@ ddd, dd MMM yyyy</source>
         <translation type="obsolete">мин/миля</translation>
     </message>
     <message>
-        <location filename="../../Charts/CPPlot.cpp" line="2199"/>
+        <location filename="../../Charts/CPPlot.cpp" line="2647"/>
         <source>%10 %</source>
         <translation>%10 %</translation>
     </message>
@@ -5528,98 +5852,98 @@ ddd, dd MMM yyyy</source>
 <context>
     <name>CVPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5367"/>
-        <location filename="../../Gui/Pages.cpp" line="5376"/>
+        <location filename="../../Gui/Pages.cpp" line="5903"/>
+        <location filename="../../Gui/Pages.cpp" line="5912"/>
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5369"/>
-        <location filename="../../Gui/Pages.cpp" line="5383"/>
+        <location filename="../../Gui/Pages.cpp" line="5905"/>
+        <location filename="../../Gui/Pages.cpp" line="5919"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5370"/>
-        <location filename="../../Gui/Pages.cpp" line="5384"/>
+        <location filename="../../Gui/Pages.cpp" line="5906"/>
+        <location filename="../../Gui/Pages.cpp" line="5920"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5377"/>
-        <location filename="../../Gui/Pages.cpp" line="5389"/>
+        <location filename="../../Gui/Pages.cpp" line="5913"/>
+        <location filename="../../Gui/Pages.cpp" line="5925"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5378"/>
-        <location filename="../../Gui/Pages.cpp" line="5390"/>
+        <location filename="../../Gui/Pages.cpp" line="5914"/>
+        <location filename="../../Gui/Pages.cpp" line="5926"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5380"/>
+        <location filename="../../Gui/Pages.cpp" line="5916"/>
         <source>Def</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5400"/>
-        <location filename="../../Gui/Pages.cpp" line="5437"/>
+        <location filename="../../Gui/Pages.cpp" line="5936"/>
+        <location filename="../../Gui/Pages.cpp" line="5973"/>
         <source>From Date</source>
         <translation>Дата замера</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5401"/>
-        <location filename="../../Gui/Pages.cpp" line="5438"/>
+        <location filename="../../Gui/Pages.cpp" line="5937"/>
+        <location filename="../../Gui/Pages.cpp" line="5974"/>
         <source>Critical Velocity</source>
         <translation>Критический темп</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5414"/>
+        <location filename="../../Gui/Pages.cpp" line="5950"/>
         <source>Metric Pace</source>
         <translation>В метрических единицах</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5458"/>
-        <location filename="../../Gui/Pages.cpp" line="5539"/>
-        <location filename="../../Gui/Pages.cpp" line="5563"/>
+        <location filename="../../Gui/Pages.cpp" line="5994"/>
+        <location filename="../../Gui/Pages.cpp" line="6075"/>
+        <location filename="../../Gui/Pages.cpp" line="6099"/>
         <source>MMM d, yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5474"/>
+        <location filename="../../Gui/Pages.cpp" line="6010"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5475"/>
+        <location filename="../../Gui/Pages.cpp" line="6011"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5476"/>
+        <location filename="../../Gui/Pages.cpp" line="6012"/>
         <source>From</source>
         <translation>Предел</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5525"/>
+        <location filename="../../Gui/Pages.cpp" line="6061"/>
         <source>CV must be &gt; 0</source>
         <translation>КТ должен быть больше 0</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5693"/>
+        <location filename="../../Gui/Pages.cpp" line="6229"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5716"/>
-        <location filename="../../Gui/Pages.cpp" line="5723"/>
+        <location filename="../../Gui/Pages.cpp" line="6252"/>
+        <location filename="../../Gui/Pages.cpp" line="6259"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5718"/>
-        <location filename="../../Gui/Pages.cpp" line="5725"/>
+        <location filename="../../Gui/Pages.cpp" line="6254"/>
+        <location filename="../../Gui/Pages.cpp" line="6261"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -5627,59 +5951,77 @@ ddd, dd MMM yyyy</source>
 <context>
     <name>CalDAV</name>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="87"/>
-        <location filename="../../Cloud/CalDAV.cpp" line="414"/>
-        <location filename="../../Cloud/CalDAV.cpp" line="523"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="79"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="482"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="604"/>
         <source>Missing Preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="87"/>
-        <location filename="../../Cloud/CalDAV.cpp" line="414"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="79"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="482"/>
         <source>CalID or CalDAV Url is missing in preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="125"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="130"/>
         <source>CalDAV REPORT url error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="460"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="536"/>
         <source>CalDAV Calendar API reply error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="506"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="587"/>
         <source>HTTP</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">HTTP</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="506"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="587"/>
         <source>SSL error(s) has occurred: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка SSL: %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="523"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="604"/>
         <source>Authorization for Google CalDAV is missing in preferences</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="586"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="667"/>
         <source>Authorization Error</source>
         <translation type="unfinished">Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="586"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="667"/>
         <source>Error requesting access token</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CalDAV.cpp" line="444"/>
+        <location filename="../../Cloud/CalDAV.cpp" line="520"/>
         <source>CalDAV Calendar url error</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>CalDAVCloud</name>
+    <message>
+        <location filename="../../Cloud/CalDAVCloud.h" line="70"/>
+        <source>Google Calendar using CalDAV protocol and authenticate using Google Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CalDAVCloud.h" line="71"/>
+        <source>Web Calendar using iCal format as a web resource</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CalDAVCloud.h" line="73"/>
+        <source>Generic CalDAV Calendar such as Apple iCloud calendar</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>CalendarDownload</name>
     <message>
@@ -5706,35 +6048,35 @@ ddd, dd MMM yyyy</source>
 <context>
     <name>Card</name>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="357"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="365"/>
         <source>Time In Zone</source>
         <translation type="unfinished">Время в зоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="586"/>
-        <location filename="../../Charts/OverviewWindow.cpp" line="624"/>
-        <location filename="../../Charts/OverviewWindow.cpp" line="667"/>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1068"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="594"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="632"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="675"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1070"/>
         <source>seconds</source>
         <translation type="unfinished">секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1161"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1163"/>
         <source>Form</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1182"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1184"/>
         <source>Fitness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1205"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1207"/>
         <source>Fatigue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1228"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1230"/>
         <source>Risk</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5835,12 +6177,12 @@ Are you sure?</source>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="31"/>
         <source>GoldenCheetah CloudDB - Terms and Conditions</source>
-        <translation type="unfinished"></translation>
+        <translation>GoldenCheetah CloudDB - Условия соглашения</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="46"/>
         <source>&lt;b&gt;&lt;big&gt;Please read terms and conditions carefully before accepting !&lt;/big&gt;&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;&lt;big&gt;Пожалуйста прочитайте пользовательское соглашение внимательно!&lt;/big&gt;&lt;/b&gt;</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="56"/>
@@ -5850,12 +6192,12 @@ Are you sure?</source>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="112"/>
         <source>Accept the rules and conditions of CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation>Принять правила и условия использования CloudDB</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="115"/>
         <source>Reject and don&apos;t use CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation>Отклонить и не использовать CloudDB</translation>
     </message>
 </context>
 <context>
@@ -5878,278 +6220,294 @@ Are you sure?</source>
     <message>
         <location filename="../../Cloud/CloudDBTelemetry.cpp" line="119"/>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Да</translation>
     </message>
 </context>
 <context>
     <name>CloudDBChartListDialog</name>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="446"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="450"/>
         <source>First</source>
-        <translation type="unfinished">1-й критерий</translation>
+        <translation>Первый</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="447"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="451"/>
         <source>Next %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Следующие %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="448"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="452"/>
         <source>Prev %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Предыдущие %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="465"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="469"/>
         <source>My Charts</source>
-        <translation type="unfinished"></translation>
+        <translation>Мои графики</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="471"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="475"/>
         <source>All</source>
-        <translation type="unfinished">Все</translation>
+        <translation>Все</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="472"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="476"/>
         <source>Curated Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="473"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="477"/>
         <source>Uncurated Only</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="481"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="485"/>
         <source>Any Sport</source>
-        <translation type="unfinished"></translation>
+        <translation>любой спорт</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="489"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="493"/>
         <source>Any Language</source>
-        <translation type="unfinished"></translation>
+        <translation>любой язык</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="494"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1030"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="498"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1047"/>
         <source>Search Keyword</source>
-        <translation type="unfinished"></translation>
+        <translation>Слова для поиска</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="633"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="637"/>
         <source>Select charts to download</source>
-        <translation type="unfinished"></translation>
+        <translation>Выберите графики для скачивания</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="705"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="709"/>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">неизвеcтно</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="708"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="712"/>
         <source>Trends</source>
         <translation>Динамика показателей</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="709"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="713"/>
         <source>Activities</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="710"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="714"/>
         <source>Diary</source>
         <translation>Дневник</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="711"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="715"/>
         <source>Train</source>
         <translation>Тренажёр</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="715"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="719"/>
         <source>All Views</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Все виды</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="848"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="853"/>
         <source>Chart requires &apos;R&apos;</source>
-        <translation type="unfinished"></translation>
+        <translation>График требует поддержки языка R</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="848"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="853"/>
         <source>The chart your are downloading requires &apos;R&apos; to be installed                                                                               and activated for GoldenCheetah to show any graphics. Either &apos;R&apos; is not activated                                                                               in the preferences, or not even installed.&lt;br&gt;&lt;br&gt; Please ensure &apos;R&apos;                                                                               is installed and activated to be able to use this chart.</source>
-        <translation type="unfinished"></translation>
+        <translation>График, который вы скачиваете, требует поддержки языка R в GoldenCheetah.
+В настоящее время язык R не установлен или его поддержка не включена в настройках.
+
+Проверьте установку языка R или активируйте его поддержку в настройках, что бы использовать этот график.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="941"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="864"/>
+        <source>Chart requires &apos;Python&apos;</source>
+        <translation>График требует поддержки языка Python</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="864"/>
+        <source>The chart your are downloading requires &apos;Python&apos; to be installed                                                                               and activated for GoldenCheetah to show any graphics. Either &apos;Python&apos; is not activated                                                                               in the preferences, or not even installed.&lt;br&gt;&lt;br&gt; Please ensure &apos;Python&apos;                                                                               is installed and activated to be able to use this chart.</source>
+        <translation>График, который вы скачиваете, требует поддержки языка Python в GoldenCheetah.
+В настоящее время язык Python не установлен или его поддержка не включена в настройках.
+
+Проверьте установку языка Python или активируйте его поддержку в настройках, что бы использовать этот график.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="958"/>
         <source>Chart Maintenance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="941"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="958"/>
         <source>Do you really want to delete this chart definition ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы действительно хотите удалить этот график?</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="546"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="563"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="550"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="567"/>
         <source>Delete selected chart</source>
-        <translation type="unfinished"></translation>
+        <translation>Удалить выбранный график</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="547"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="562"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="551"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="566"/>
         <source>Edit selected chart</source>
-        <translation type="unfinished"></translation>
+        <translation>Редактировать выбранный график</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="531"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="548"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="564"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="535"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="552"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="568"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="445"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="449"/>
         <source>Showing %1 to %2 of %3 charts for %4 / Total uploaded %5</source>
-        <translation type="unfinished"></translation>
+        <translation>Показаны графики с %1 по %2 из %3 для «%4», всего загружено %5</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="530"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="534"/>
         <source>Download selected chart(s)</source>
-        <translation type="unfinished"></translation>
+        <translation>Скачать выбранные графики</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="561"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="565"/>
         <source>Set selected chart &apos;Curated&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="623"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="627"/>
         <source>Chart maintenance - Edit or Delete your Charts</source>
-        <translation type="unfinished"></translation>
+        <translation>Обслуживание графиков: редактирование или удаление ваших графиков</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="629"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="633"/>
         <source>Curator chart maintenance - Curate, Edit or Delete Charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="736"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="740"/>
         <source>&lt;h3&gt;%1&lt;/h3&gt;&lt;h4&gt;Last Edited At: %2 - Creator: %3&lt;/h4&gt;%4</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;h3&gt;%1&lt;/h3&gt;&lt;h4&gt;Последняя правка: %2 - Создатель: %3&lt;/h4&gt;%4</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1034"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1051"/>
         <source>Reset Search</source>
-        <translation type="unfinished"></translation>
+        <translation>Сбросить поиск</translation>
     </message>
 </context>
 <context>
     <name>CloudDBChartObjectDialog</name>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1248"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1265"/>
         <source>Chart Name</source>
-        <translation type="unfinished"></translation>
+        <translation>Название графика</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1250"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1267"/>
         <source>&lt;Chart Name&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Введите Название графика&gt;</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1263"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1280"/>
         <source>Sport</source>
         <translation>Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1274"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1291"/>
         <source>Language</source>
         <translation>Язык</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1287"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1304"/>
         <source>Nickname</source>
-        <translation type="unfinished">Псевдоним</translation>
+        <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1295"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1312"/>
         <source>E-Mail</source>
-        <translation type="unfinished"></translation>
+        <translation>E-Mail</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1313"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1330"/>
         <source>Version Details</source>
-        <translation type="unfinished"></translation>
+        <translation>Версия</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1317"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1334"/>
         <source>Creator UUid</source>
-        <translation type="unfinished"></translation>
+        <translation>UUid создателя</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1341"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1358"/>
         <source>&lt;Enter the description of the chart here&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;Введите описание загружаемого графика&gt;</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1353"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1370"/>
         <source>Upload</source>
-        <translation type="unfinished">Закачать</translation>
+        <translation>Закачать</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1386"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1391"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1395"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1400"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1431"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1447"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1403"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1408"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1412"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1417"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1448"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1464"/>
         <source>Upload Chart</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузить график</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1386"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1447"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1403"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1464"/>
         <source>Please enter a valid chart name with min. 5 characters length.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста укажтите корретное название для графика. Не менее 5 символов.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1391"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1408"/>
         <source>Please enter a nickname for this athlete.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, укажите псевданим спортсмена.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1395"/>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1431"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1412"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1448"/>
         <source>Please enter a valid e-mail address.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, укажите корректный e-mail.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1400"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1417"/>
         <source>Please enter a sensible chart description.</source>
-        <translation type="unfinished"></translation>
+        <translation>Пожалуйста, введите осмысленное описание для графика.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1404"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1421"/>
         <source>Cloud Upload</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка в облако</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1404"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1421"/>
         <source>Do you want to upload this chart definition ?</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузить этот график в облачное хранилище?</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1354"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1371"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отмена</translation>
     </message>
 </context>
 <context>
     <name>CloudDBChartShowPictureDialog</name>
     <message>
-        <location filename="../../Cloud/CloudDBChart.cpp" line="1203"/>
+        <location filename="../../Cloud/CloudDBChart.cpp" line="1220"/>
         <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
+        <translation>Закрыть</translation>
     </message>
 </context>
 <context>
@@ -6161,38 +6519,38 @@ Are you sure?</source>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="232"/>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="238"/>
         <source>CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation>CloudDB</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="215"/>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="232"/>
         <source>Usage has exceeded the free quota - please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Превышена разрешённая бесплатная квота, пожалуйста повторите попытку позже.</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="223"/>
         <source>Technical problem with CloudDB - please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Техническая проблема с CloudDB, пожалуйста повторите попытку позже.</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="229"/>
         <source>Authorization problem with CloudDB - please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Проблема с авторизацией в CloudDB, пожалуйста повторите попытку позже.</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="238"/>
         <source>Technical problem with CloudDB - response code: %1 - please try again later.</source>
-        <translation type="unfinished"></translation>
+        <translation>Техническая проблема с CloudDB - код ответа: %1, пожалуйста повторите попытку позже.</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="301"/>
         <source>HTTP</source>
-        <translation type="unfinished"></translation>
+        <translation>HTTP</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="301"/>
         <source>SSL error(s) has occurred: %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка SSL: %1</translation>
     </message>
 </context>
 <context>
@@ -6200,12 +6558,12 @@ Are you sure?</source>
     <message>
         <location filename="../../Cloud/CloudDBCurator.cpp" line="64"/>
         <source>CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation>CloudDB</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCurator.cpp" line="64"/>
         <source>Technical problem reading curator list - please try again later</source>
-        <translation type="unfinished"></translation>
+        <translation>Техническая проблема с чтением списка кураторов, пожалуйста повторите попытку позже</translation>
     </message>
 </context>
 <context>
@@ -6214,39 +6572,39 @@ Are you sure?</source>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="70"/>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="99"/>
         <source>CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation>CloudDB</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="70"/>
         <source>Technical problem reading latest status - please try again later</source>
-        <translation type="unfinished"></translation>
+        <translation>Техническая проблема с получением текущего статуса, пожалуйста повторите попытку позже</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="99"/>
         <source>Technical problem reading status text - please try again later</source>
-        <translation type="unfinished"></translation>
+        <translation>Техническая проблема с чтением текста статуса, пожалуйста повторите попытку позже</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="161"/>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="164"/>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="167"/>
         <source>CloudDB Status</source>
-        <translation type="unfinished"></translation>
+        <translation>Статус CloudDB</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="161"/>
         <source>&lt;b&gt;&lt;big&gt;Ok&lt;/big&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;All Services should be operational - no problems known.</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;&lt;big&gt;Доступно&lt;/big&gt;&lt;/b&gt;&lt;br&gt;&lt;br&gt;Проблем не обнаружено, все сервисы работают.</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="164"/>
         <source>&lt;b&gt;&lt;big&gt;Limited Service&lt;/big&gt;&lt;/b&gt;&lt;br&gt;Sorry - some CloudDB services are not operational.&lt;br&gt;&lt;br&gt;&lt;b&gt;More information:&lt;/b&gt;&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;&lt;big&gt;Доступ к сервису ограничен&lt;/big&gt;&lt;/b&gt;&lt;br&gt;Извините, сервис CloudDB сейчас не доступен.&lt;br&gt;&lt;br&gt;&lt;b&gt;Дополнительная информация:&lt;/b&gt;&lt;br&gt;%1</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBStatus.cpp" line="167"/>
         <source>&lt;b&gt;&lt;big&gt;Service outage&lt;/big&gt;&lt;/b&gt;&lt;br&gt;Sorry - CloudDB services are not operational.&lt;br&gt;&lt;br&gt;&lt;b&gt;More information:&lt;/b&gt;&lt;br&gt;%1</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;b&gt;&lt;big&gt;Сервис не доступен&lt;/big&gt;&lt;/b&gt;&lt;br&gt;Извините, сервис CloudDB сейчас не доступен.&lt;br&gt;&lt;br&gt;&lt;b&gt;Дополнительная информация:&lt;/b&gt;&lt;br&gt;%1</translation>
     </message>
 </context>
 <context>
@@ -6254,87 +6612,115 @@ Are you sure?</source>
     <message>
         <location filename="../../Cloud/CloudDBVersion.cpp" line="147"/>
         <source>GoldenCheetah - Check for new versions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">GoldenCheetah - Проверить наличие обновлений</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="162"/>
-        <source>&lt;b&gt;&lt;big&gt;New Version(s) of GoldenCheetah are available&lt;/big&gt;&lt;/b&gt;</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="163"/>
+        <source>&lt;b&gt;&lt;big&gt;New versions of GoldenCheetah are available&lt;/big&gt;&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;&lt;big&gt;Доступна новая версия GoldenCheetah&lt;/big&gt;&lt;/b&gt;</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="179"/>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="165"/>
+        <source>&lt;b&gt;&lt;big&gt;A new version of GoldenCheetah is available&lt;/big&gt;&lt;/b&gt;</source>
+        <translation type="unfinished">&lt;b&gt;&lt;big&gt;Доступна новая версия GoldenCheetah&lt;/big&gt;&lt;/b&gt;</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="183"/>
         <source>Release: %1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="181"/>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="185"/>
         <source>Release Candidate: %1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="183"/>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="187"/>
         <source>Development Release: %1 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="198"/>
-        <source>Do not show these versions again</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="205"/>
+        <source>Do not show again</source>
+        <translation type="unfinished">Не показывать снова</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudDBVersion.cpp" line="200"/>
-        <source>Show available versions again in %1 days</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Cloud/CloudDBVersion.cpp" line="207"/>
+        <source>Show again in %1 days</source>
+        <translation type="unfinished">Показать через %1 дней</translation>
     </message>
 </context>
 <context>
     <name>CloudService</name>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="231"/>
+        <location filename="../../Cloud/CloudService.cpp" line="240"/>
         <source>expected compressed activity file.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../Cloud/CloudService.h" line="92"/>
+        <source>None</source>
+        <translation type="unfinished">Нет</translation>
+    </message>
+</context>
+<context>
+    <name>CloudServiceAutoDownloadWidget</name>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="2007"/>
+        <source>Downloading</source>
+        <translation type="unfinished">Скачивание</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="2008"/>
+        <source>Checking</source>
+        <translation type="unfinished">Проверка</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="2044"/>
+        <source>Last 30 days</source>
+        <translation type="unfinished">Последние 30 дней</translation>
+    </message>
 </context>
 <context>
     <name>CloudServiceDialog</name>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="378"/>
-        <location filename="../../Cloud/CloudService.cpp" line="580"/>
+        <location filename="../../Cloud/CloudService.cpp" line="435"/>
+        <location filename="../../Cloud/CloudService.cpp" line="637"/>
         <source>Folder</source>
         <translation type="unfinished">Папка</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="385"/>
+        <location filename="../../Cloud/CloudService.cpp" line="442"/>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Название</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="386"/>
+        <location filename="../../Cloud/CloudService.cpp" line="443"/>
         <source>Type</source>
         <translation type="unfinished">Тип</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="387"/>
+        <location filename="../../Cloud/CloudService.cpp" line="444"/>
         <source>Modified</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменено</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="402"/>
+        <location filename="../../Cloud/CloudService.cpp" line="459"/>
         <source>Create Folder</source>
         <translation type="unfinished">Создать папку</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="403"/>
+        <location filename="../../Cloud/CloudService.cpp" line="460"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отмена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="404"/>
+        <location filename="../../Cloud/CloudService.cpp" line="461"/>
         <source>Open</source>
         <translation type="unfinished">Открыть</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="593"/>
+        <location filename="../../Cloud/CloudService.cpp" line="650"/>
         <source>d MMM yyyy</source>
         <translation type="unfinished">d MMM yyyy</translation>
     </message>
@@ -6342,297 +6728,336 @@ Are you sure?</source>
 <context>
     <name>CloudServiceSyncDialog</name>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="636"/>
+        <location filename="../../Cloud/CloudService.cpp" line="697"/>
         <source>Synchronise </source>
-        <translation type="unfinished">Синхронизировать </translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="644"/>
-        <source>Sync with </source>
-        <translation type="unfinished">Синхронизировать с </translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="645"/>
-        <source>Unable to connect, check your configuration in preferences.</source>
-        <translation type="unfinished">Невозможно подключиться, проверьте установки в настройках.</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="664"/>
-        <location filename="../../Cloud/CloudService.cpp" line="694"/>
-        <location filename="../../Cloud/CloudService.cpp" line="996"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1096"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1190"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1257"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1357"/>
-        <source>Download</source>
-        <translation type="unfinished">Скачать</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="665"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1077"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1100"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1472"/>
-        <source>Upload</source>
-        <translation type="unfinished">Закачать</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="666"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1104"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1302"/>
-        <source>Synchronize</source>
-        <translation type="unfinished">Синхронизировать</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="681"/>
-        <source>From:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="682"/>
-        <source>To:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="692"/>
-        <source>Refresh List</source>
-        <translation type="unfinished">Обновить список</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="693"/>
-        <source>Close</source>
-        <translation type="unfinished">Закрыть</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="696"/>
-        <location filename="../../Cloud/CloudService.cpp" line="723"/>
-        <location filename="../../Cloud/CloudService.cpp" line="753"/>
-        <source>Select all</source>
-        <translation type="unfinished">Выбрать все</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="702"/>
-        <source>Workout Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="703"/>
-        <location filename="../../Cloud/CloudService.cpp" line="730"/>
-        <location filename="../../Cloud/CloudService.cpp" line="769"/>
-        <source>Date</source>
-        <translation type="unfinished">Дата</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/CloudService.cpp" line="704"/>
-        <location filename="../../Cloud/CloudService.cpp" line="731"/>
-        <location filename="../../Cloud/CloudService.cpp" line="770"/>
-        <source>Time</source>
-        <translation type="unfinished">Время</translation>
+        <translation>Синхронизировать </translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudService.cpp" line="705"/>
-        <location filename="../../Cloud/CloudService.cpp" line="734"/>
-        <source>Exists</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Cloud/CloudService.cpp" line="905"/>
+        <source>Sync with </source>
+        <translation>Синхронизировать с </translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudService.cpp" line="706"/>
-        <location filename="../../Cloud/CloudService.cpp" line="735"/>
-        <location filename="../../Cloud/CloudService.cpp" line="774"/>
-        <source>Status</source>
-        <translation type="unfinished">Статус</translation>
+        <source>Unable to connect, check your configuration in preferences.</source>
+        <translation>Невозможно подключиться, проверьте установки в настройках.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="707"/>
-        <location filename="../../Cloud/CloudService.cpp" line="775"/>
+        <location filename="../../Cloud/CloudService.cpp" line="725"/>
+        <location filename="../../Cloud/CloudService.cpp" line="755"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1105"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1216"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1310"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1377"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1477"/>
+        <source>Download</source>
+        <translation>Скачать</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="726"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1186"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1220"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1592"/>
+        <source>Upload</source>
+        <translation>Закачать</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="727"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1224"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1422"/>
+        <source>Synchronize</source>
+        <translation>Синхронизировать</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="742"/>
+        <source>From:</source>
+        <translation>От:</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="743"/>
+        <source>To:</source>
+        <translation>До:</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="753"/>
+        <source>Refresh List</source>
+        <translation>Обновить список</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="754"/>
+        <source>Close</source>
+        <translation>Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="757"/>
+        <location filename="../../Cloud/CloudService.cpp" line="784"/>
+        <location filename="../../Cloud/CloudService.cpp" line="814"/>
+        <source>Select all</source>
+        <translation>Выбрать все</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="763"/>
+        <source>Workout Name</source>
+        <translation>Название тренировки</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="764"/>
+        <location filename="../../Cloud/CloudService.cpp" line="791"/>
+        <location filename="../../Cloud/CloudService.cpp" line="830"/>
+        <source>Date</source>
+        <translation>Дата</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="765"/>
+        <location filename="../../Cloud/CloudService.cpp" line="792"/>
+        <location filename="../../Cloud/CloudService.cpp" line="831"/>
+        <source>Time</source>
+        <translation>Время</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="766"/>
+        <location filename="../../Cloud/CloudService.cpp" line="795"/>
+        <source>Exists</source>
+        <translation>Существует</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="767"/>
+        <location filename="../../Cloud/CloudService.cpp" line="796"/>
+        <location filename="../../Cloud/CloudService.cpp" line="835"/>
+        <source>Status</source>
+        <translation>Статус</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="768"/>
+        <location filename="../../Cloud/CloudService.cpp" line="836"/>
         <source>Workout Id</source>
         <translation type="unfinished">Id Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="729"/>
+        <location filename="../../Cloud/CloudService.cpp" line="790"/>
         <source>File</source>
-        <translation type="unfinished">Файл</translation>
+        <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="732"/>
-        <location filename="../../Cloud/CloudService.cpp" line="771"/>
+        <location filename="../../Cloud/CloudService.cpp" line="793"/>
+        <location filename="../../Cloud/CloudService.cpp" line="832"/>
         <source>Duration</source>
-        <translation type="unfinished"></translation>
+        <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="733"/>
-        <location filename="../../Cloud/CloudService.cpp" line="772"/>
+        <location filename="../../Cloud/CloudService.cpp" line="794"/>
+        <location filename="../../Cloud/CloudService.cpp" line="833"/>
         <source>Distance</source>
-        <translation type="unfinished"></translation>
+        <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="756"/>
+        <location filename="../../Cloud/CloudService.cpp" line="817"/>
         <source>Keep all do not delete</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить все, не удалять</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="757"/>
+        <location filename="../../Cloud/CloudService.cpp" line="818"/>
         <source>Keep %1 but delete Local</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить в %1, но удалить локально</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="758"/>
+        <location filename="../../Cloud/CloudService.cpp" line="819"/>
         <source>Keep Local but delete %1</source>
-        <translation type="unfinished"></translation>
+        <translation>Сохранить локально, удалить в %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="768"/>
+        <location filename="../../Cloud/CloudService.cpp" line="829"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation>Источник</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="773"/>
+        <location filename="../../Cloud/CloudService.cpp" line="834"/>
         <source>Action</source>
-        <translation type="unfinished">Действие</translation>
+        <translation>Действие</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="795"/>
+        <location filename="../../Cloud/CloudService.cpp" line="856"/>
         <source>Initial</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="797"/>
+        <location filename="../../Cloud/CloudService.cpp" line="858"/>
         <source>Overwrite existing files</source>
-        <translation type="unfinished">Перезаписать существующие файлы</translation>
+        <translation>Перезаписать существующие файлы</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="915"/>
-        <location filename="../../Cloud/CloudService.cpp" line="978"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1023"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1069"/>
+        <location filename="../../Cloud/CloudService.cpp" line="907"/>
+        <source>One of your activities has unsaved changes.</source>
+        <translation>Одна из ваших тренировок имеет не сохранённые изменения.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="909"/>
+        <source>%1 of your activities have unsaved changes.</source>
+        <translation>%1 ваших тренировок имеют не сохранённые изменения.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="911"/>
+        <source>Changes in activities which are not saved, will not be synchronized. 
+
+This may lead to inconsistencies between your local GoldenCheetah activities and the uploaded activities. We recommend to save the changed activities before proceeding.</source>
+        <translation>Изменения в тренировках, которые не были сохранены, не будут синхронизированы. 
+
+Это может привести к несогласованности между локальными данными в GoldenCheetah и загруженными тренировками. Мы рекомендуем сохранить все изменения перед началом.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="1024"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1087"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1132"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1178"/>
         <source>MMM d, yyyy</source>
         <translation type="unfinished">d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1091"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1200"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1211"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1320"/>
         <source>Abort</source>
         <translation type="unfinished">Прервать</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1151"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1165"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1179"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1271"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1285"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1299"/>
         <source>%1 of %2 selected</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">%1 из %2 выбрано</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1256"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1376"/>
         <source>Processed %1 of %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Обрабатывается %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1258"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1339"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1378"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1459"/>
         <source>Downloading</source>
-        <translation type="unfinished"></translation>
+        <translation>Скачивание</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1266"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1440"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1386"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1560"/>
         <source>Uploading</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1286"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1460"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1406"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1580"/>
         <source>Parse failure</source>
-        <translation type="unfinished"></translation>
+        <translation>Ошибка обработки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1301"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1421"/>
         <source>Sync complete</source>
-        <translation type="unfinished">Синхронизация завершена</translation>
+        <translation>Синхронизация завершена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1313"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1433"/>
         <source>Processed %1 of %2 successfully</source>
-        <translation type="unfinished">Успешно обработано: %1 из %2</translation>
+        <translation>Успешно обработано: %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1331"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1432"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1530"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1451"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1552"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1650"/>
         <source>File exists</source>
-        <translation type="unfinished">Файл уже существует</translation>
+        <translation>Файл уже существует</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1341"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1461"/>
         <source>Downloaded %1 of %2</source>
-        <translation type="unfinished">Скачано: %1 из %2</translation>
+        <translation>Скачано: %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1356"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1476"/>
         <source>Downloads complete</source>
-        <translation type="unfinished">Скачивание завершено</translation>
+        <translation>Скачивание завершено</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1367"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1487"/>
         <source>Downloaded %1 of %2 successfully</source>
-        <translation type="unfinished">Успешно скачано: %1 из %2</translation>
+        <translation>Успешно скачано: %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1384"/>
-        <location filename="../../Cloud/CloudService.cpp" line="1494"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1504"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1614"/>
         <source>Aborted</source>
         <translation type="unfinished">Прервано</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1402"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1522"/>
         <source>Saved</source>
         <translation type="unfinished">Сохранено</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1442"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1562"/>
         <source>Uploaded %1 of %2</source>
-        <translation type="unfinished">Закачано %1 из %2</translation>
+        <translation>Закачано %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1471"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1591"/>
         <source>Uploads complete</source>
-        <translation type="unfinished">Закачивание завершено</translation>
+        <translation>Закачивание завершено</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1482"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1602"/>
         <source>Uploaded %1 of %2 successfully</source>
-        <translation type="unfinished">Успешно закачано %1 из %2</translation>
+        <translation>Успешно закачано %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="1502"/>
+        <location filename="../../Cloud/CloudService.cpp" line="1622"/>
         <source>Completed.</source>
-        <translation type="unfinished">Завершено.</translation>
+        <translation>Завершено.</translation>
     </message>
 </context>
 <context>
     <name>CloudServiceUploadDialog</name>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="304"/>
+        <location filename="../../Cloud/CloudService.cpp" line="315"/>
         <source>Uploading %1 bytes...</source>
-        <translation type="unfinished"></translation>
+        <translation>Загружается %1 байт...</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="312"/>
+        <location filename="../../Cloud/CloudService.cpp" line="323"/>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="325"/>
+        <location filename="../../Cloud/CloudService.cpp" line="340"/>
+        <source>Upload to </source>
+        <translation>Загрузить в </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="341"/>
+        <source>The activity you want to upload has unsaved changes.</source>
+        <translation>Тренировка, котрую вы хотите загрузить имеет не сохранённые изменений.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="342"/>
+        <source>Unsaved changes in activities will be uploaded as well. 
+
+This may lead to inconsistencies between your local activities and the uploaded activities if you do not save the activity in GoldenCheetah. We recommend to save the changed activity before proceeding.</source>
+        <translation>Изменения в тренировках, которые не были сохранены, не будут синхронизированы. 
+
+Это может привести к несогласованности между локальными данными в GoldenCheetah и загруженными тренировками. Мы рекомендуем сохранить все изменения перед началом.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CloudService.cpp" line="382"/>
         <source>Upload Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>Загрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="326"/>
+        <location filename="../../Cloud/CloudService.cpp" line="383"/>
         <source>Unable to upload, check your configuration in preferences.</source>
-        <translation type="unfinished"></translation>
+        <translation>Невозможно загрузить, проверьте настройки.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="358"/>
+        <location filename="../../Cloud/CloudService.cpp" line="415"/>
         <source>OK</source>
-        <translation type="unfinished"></translation>
+        <translation>ОК</translation>
     </message>
 </context>
 <context>
@@ -6646,42 +7071,42 @@ Are you sure?</source>
 <context>
     <name>ColorsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1711"/>
+        <location filename="../../Gui/Pages.cpp" line="2231"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1712"/>
+        <location filename="../../Gui/Pages.cpp" line="2232"/>
         <source>Select</source>
         <translation>Выбор</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1725"/>
+        <location filename="../../Gui/Pages.cpp" line="2245"/>
         <source>Activity Scrollbar</source>
         <translation>Полоса прокрутки тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1728"/>
+        <location filename="../../Gui/Pages.cpp" line="2248"/>
         <source>Activity Headings</source>
         <translation>Заголовки тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1739"/>
+        <location filename="../../Gui/Pages.cpp" line="2259"/>
         <source>Line Width</source>
         <translation>Толщина линии</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1740"/>
+        <location filename="../../Gui/Pages.cpp" line="2260"/>
         <source>Font</source>
-        <translation type="unfinished"></translation>
+        <translation>Шрифт</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1741"/>
+        <location filename="../../Gui/Pages.cpp" line="2261"/>
         <source>Font Scaling</source>
-        <translation type="unfinished"></translation>
+        <translation>Размер шрифта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1721"/>
+        <location filename="../../Gui/Pages.cpp" line="2241"/>
         <source>Antialias</source>
         <translation>Сглаживание</translation>
     </message>
@@ -6698,17 +7123,17 @@ Are you sure?</source>
         <translation type="vanished">Плоские цвета (Windows)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1700"/>
+        <location filename="../../Gui/Pages.cpp" line="2220"/>
         <source>Swatch</source>
         <translation>Образцы цветов</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1701"/>
+        <location filename="../../Gui/Pages.cpp" line="2221"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1736"/>
+        <location filename="../../Gui/Pages.cpp" line="2256"/>
         <source>Apply Theme</source>
         <translation>Применить тему</translation>
     </message>
@@ -6733,12 +7158,12 @@ Are you sure?</source>
         <translation type="vanished">Текст календаря</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1804"/>
+        <location filename="../../Gui/Pages.cpp" line="2324"/>
         <source>Theme</source>
         <translation>Тема</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1805"/>
+        <location filename="../../Gui/Pages.cpp" line="2325"/>
         <source>Colors</source>
         <translation>Цвета</translation>
     </message>
@@ -6746,7 +7171,7 @@ Are you sure?</source>
 <context>
     <name>ColumnChooser</name>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1282"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1284"/>
         <source>Column Chooser</source>
         <translation>Выбор столбцов</translation>
     </message>
@@ -6807,7 +7232,7 @@ Are you sure?</source>
 <context>
     <name>ConfigDialog</name>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="78"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="80"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
@@ -6816,27 +7241,27 @@ Are you sure?</source>
         <translation type="vanished">Пароли</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="86"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="88"/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="90"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="92"/>
         <source>Data Fields</source>
         <translation>Поля данных</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="94"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="96"/>
         <source>Metrics</source>
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="98"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="100"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="103"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="105"/>
         <source>Training</source>
         <translation>Тренажёр</translation>
     </message>
@@ -6845,22 +7270,22 @@ Are you sure?</source>
         <translation type="vanished">Устройства</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="156"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="158"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="157"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="159"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="229"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="234"/>
         <source>You changed the location of the athlete library</source>
         <translation>Вы изменили расположение директории с библиотекой спорстменов (или оно не задано)</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="230"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="235"/>
         <source>This is where all new athletes and their files will now be stored.
 
 Current athlete data will no longer be available and GoldenCheetah will need to restart for the change to take effect.
@@ -6873,29 +7298,29 @@ Do you want to apply and restart GoldenCheetah?</source>
 Применить изменения и перезапустить GoldenCheetah?</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="236"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="241"/>
         <source>No, Keep current</source>
         <translation>Нет, оставить как есть</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="237"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="242"/>
         <source>Yes, Apply and Restart</source>
         <translation>Да, применить и перезапустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="41"/>
-        <location filename="../../Gui/ConfigDialog.cpp" line="181"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="43"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="183"/>
         <source>Preferences</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="47"/>
-        <location filename="../../Gui/ConfigDialog.cpp" line="183"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="49"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="185"/>
         <source>Options</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="82"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="84"/>
         <source>Athlete</source>
         <translation>Спортсмен</translation>
     </message>
@@ -7063,37 +7488,37 @@ Do you want to apply and restart GoldenCheetah?</source>
         <translation type="vanished">Пароль CalDAV</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="368"/>
+        <location filename="../../Gui/Pages.cpp" line="451"/>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="369"/>
+        <location filename="../../Gui/Pages.cpp" line="452"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="370"/>
+        <location filename="../../Gui/Pages.cpp" line="453"/>
         <source>Edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Изменить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="375"/>
+        <location filename="../../Gui/Pages.cpp" line="458"/>
         <source>Add</source>
         <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="376"/>
+        <location filename="../../Gui/Pages.cpp" line="459"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="387"/>
+        <location filename="../../Gui/Pages.cpp" line="470"/>
         <source>Service</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Сервис</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="388"/>
+        <location filename="../../Gui/Pages.cpp" line="471"/>
         <source>Description</source>
         <translation type="unfinished">Описание</translation>
     </message>
@@ -7114,383 +7539,441 @@ Do you want to apply and restart GoldenCheetah?</source>
 <context>
     <name>CriticalPowerWindow</name>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1414"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1425"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1444"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1506"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1517"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1536"/>
         <source>no data</source>
         <translation>нет данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="64"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="65"/>
         <source>Percentage of Best</source>
         <translation>В процентах от лучшего</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="66"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="67"/>
         <source>Show Heat</source>
         <translation>Показать совпадения</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="68"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="69"/>
         <source>Delta compare</source>
         <translation>Сравнение по дельте</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="71"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="72"/>
         <source>as percentage</source>
         <translation>в процентах</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="101"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="102"/>
         <source>Critical Power </source>
         <translation>Критическая мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="138"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="139"/>
         <source>Basic</source>
         <translation type="unfinished">Основные параметры</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="158"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="159"/>
         <source>Export Chart Data...</source>
         <translation>Экспортировать данные графика...</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="169"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="170"/>
         <source>Filter</source>
         <translation>Фильтр</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="182"/>
         <location filename="../../Charts/CriticalPowerWindow.cpp" line="183"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="184"/>
         <source>Date range</source>
         <translation>Диапазон дат</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="199"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="200"/>
         <source>Data series</source>
         <translation>Серия данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="243"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="264"/>
         <source>Activity Mean Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="244"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="265"/>
         <source>Activity Centile</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="245"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="266"/>
         <source>No Activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="248"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="269"/>
         <source>Current Activity</source>
         <translation>Текущая тренировка</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="253"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="274"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="148"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="261"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="465"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="149"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="284"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="501"/>
         <source>Model</source>
         <translation>Модель</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="203"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="204"/>
         <source>Zone Shading</source>
         <translation>Зоны на фоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="209"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="210"/>
+        <source>Show Power Profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="215"/>
         <source>Show grid</source>
         <translation>Показывать сетку</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="214"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="220"/>
+        <source>Show Performance Tests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="225"/>
         <source>Show Bests</source>
         <translation>Показывать лучшие</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="219"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="230"/>
+        <source>Filter Unique Bests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="235"/>
         <source>Show Sustained Efforts</source>
         <translation>Показывать длительные усилия</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="224"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="240"/>
         <source>Show as percentage</source>
         <translation>Показывать в процентах</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="229"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="245"/>
         <source>Show curve heat</source>
         <translation>Показать количество совпадений</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="234"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="250"/>
         <source>Show curve heat by date</source>
         <translation>Показать совпадение на дату</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="239"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="255"/>
         <source>Shade Intervals</source>
         <translation>Интервалы на фоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="254"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="260"/>
+        <source>Show time scale linear</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="275"/>
         <source>2 parameter</source>
         <translation>по 2 параметрам</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="255"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="276"/>
         <source>3 parameter</source>
         <translation>по 3 параметрам</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="256"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="277"/>
         <source>Extended CP</source>
         <translation>расширенная CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="257"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="279"/>
         <source>Multicomponent</source>
         <translation>Мультикомпонентная</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="258"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="280"/>
         <source>Ward-Smith</source>
         <translation type="unfinished">Ward-Smith</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="263"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="287"/>
+        <source>Envelope</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="288"/>
+        <source>Least Squares (LMA)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="289"/>
+        <source>Linear Regression (Work)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="291"/>
+        <source>Curve Fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="294"/>
+        <source>MMP bests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="295"/>
+        <source>Performance tests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="297"/>
+        <source>Data to fit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="299"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="304"/>
         <source> </source>
         <translation type="unfinished"> </translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="264"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="301"/>
+        <source>CP and W&apos; Decay</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="306"/>
         <source>Search Interval</source>
         <translation>Интервал поиска</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="265"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="307"/>
         <source>(seconds)</source>
         <translation>(секунд)</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="268"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="310"/>
         <source>Anaerobic</source>
         <translation>Анаэробная работа</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="291"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="333"/>
         <source>Aerobic</source>
         <translation>Аэробная работа</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="330"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="372"/>
         <source>Short anaerobic</source>
         <translation>Короткая анаэробная</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="353"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="395"/>
         <source>Long aerobic</source>
         <translation>Длинная аэробная</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="361"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="403"/>
         <source>Exponential</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="363"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="405"/>
         <source>Variant</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="364"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="406"/>
         <source>Linear feedback</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="366"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="408"/>
         <source>Regeneration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="388"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="433"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="389"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="434"/>
         <source>Rank</source>
         <translation>Ранг</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="390"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="435"/>
         <source>W&apos;</source>
         <translation>W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="391"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="436"/>
         <source>0 kJ</source>
         <translation>0 кДж</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="392"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="395"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="398"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="401"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="403"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="437"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="440"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="443"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="445"/>
         <source>n/a</source>
         <translation>—</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="393"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="438"/>
         <source>CP</source>
         <translation>CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="394"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="397"/>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="400"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="439"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="442"/>
         <source>0 w</source>
         <translation>0 Вт</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="396"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="441"/>
         <source>Pmax</source>
         <translation>Pmax</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="399"/>
         <source>FTP</source>
-        <translation>FTP</translation>
+        <translation type="vanished">FTP</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="402"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="444"/>
         <source>Endurance Index</source>
         <translation>Выносливость</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="463"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="499"/>
         <source>Motor Unit Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1454"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1546"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1455"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1547"/>
         <source>Watts per Kilogram</source>
         <translation>Ватт на килограмм</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1456"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1548"/>
         <source>xPower</source>
         <translation>xPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1457"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1549"/>
         <source>Iso Power</source>
         <translation>Нормированная мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1458"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1550"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1459"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1551"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1460"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1552"/>
         <source>Acceleration</source>
         <translation>Ускорение</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1461"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1553"/>
         <source>Power %1</source>
         <translation>Мощность %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1462"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1554"/>
         <source>Cadence %1</source>
         <translation>Каденс %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1463"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1555"/>
         <source>Torque %1</source>
         <translation>Крутящий момент %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1464"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1556"/>
         <source>Heartrate %1</source>
         <translation>ЧСС %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1465"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1557"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1466"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1558"/>
         <source>Torque</source>
         <translation>Крутящий момент</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1467"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1559"/>
         <source>VAM</source>
         <translation>VAM</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1468"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1560"/>
         <source>aPower</source>
         <translation>aPower</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1469"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1561"/>
         <source>aPower per Kilogram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1470"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1562"/>
         <source>Work</source>
         <translation>Расход энергии</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1471"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1563"/>
         <source>Veloclinic Plot</source>
         <translation type="unfinished">график Veloclinic</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1473"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1565"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1803"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1955"/>
         <source>Save Best Data as CSV</source>
         <translation>Сохранить лучшие значения в CSV</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1441"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1533"/>
         <source>no date</source>
         <translation>нет даты</translation>
     </message>
     <message>
-        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1441"/>
+        <location filename="../../Charts/CriticalPowerWindow.cpp" line="1533"/>
         <source>MM/dd/yyyy</source>
         <translation>dd.MM.yyyy</translation>
     </message>
@@ -7498,47 +7981,47 @@ Do you want to apply and restart GoldenCheetah?</source>
 <context>
     <name>CustomMetricsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2413"/>
+        <location filename="../../Gui/Pages.cpp" line="2943"/>
         <source>Symbol</source>
         <translation type="unfinished">Символ</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2414"/>
+        <location filename="../../Gui/Pages.cpp" line="2944"/>
         <source>Name</source>
         <translation type="unfinished">Имя</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2427"/>
+        <location filename="../../Gui/Pages.cpp" line="2957"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2428"/>
+        <location filename="../../Gui/Pages.cpp" line="2958"/>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2429"/>
+        <location filename="../../Gui/Pages.cpp" line="2959"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2434"/>
+        <location filename="../../Gui/Pages.cpp" line="2964"/>
         <source>Add</source>
         <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2435"/>
+        <location filename="../../Gui/Pages.cpp" line="2965"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2477"/>
+        <location filename="../../Gui/Pages.cpp" line="3013"/>
         <source>Are you sure you want to delete this metric?</source>
         <translation>Вы уверены, что хотите удалить метрику?</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2479"/>
+        <location filename="../../Gui/Pages.cpp" line="3015"/>
         <source>Remove</source>
         <translation type="unfinished">Удалить</translation>
     </message>
@@ -7546,77 +8029,53 @@ Do you want to apply and restart GoldenCheetah?</source>
 <context>
     <name>CyclingAnalytics</name>
     <message>
-        <location filename="../../Cloud/CyclingAnalytics.cpp" line="83"/>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="85"/>
         <source>Account is not configured.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/CyclingAnalytics.cpp" line="194"/>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="109"/>
+        <source>You must authorise with Cycling Analytics first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="332"/>
+        <source>Title</source>
+        <translation type="unfinished">Название</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="333"/>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="459"/>
+        <source>Notes</source>
+        <translation type="unfinished">Заметки</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="434"/>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="536"/>
         <source>Completed.</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CyclingAnalytics.cpp" line="196"/>
+        <location filename="../../Cloud/CyclingAnalytics.cpp" line="538"/>
         <source>Network Error - Upload failed.</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CyclingAnalytics.h" line="33"/>
+        <location filename="../../Cloud/CyclingAnalytics.h" line="34"/>
         <source>Cycling Analytics</source>
         <translation type="unfinished">Cycling Analytics</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CyclingAnalytics.h" line="34"/>
-        <source>Upload to the power focused cycling site.</source>
+        <location filename="../../Cloud/CyclingAnalytics.h" line="35"/>
+        <source>Sync with the power focused cycling site.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CyclingAnalyticsUploader</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1087"/>
         <source>CyclingAnalytics</source>
-        <translation>Cycling Analytics</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1100"/>
-        <source>no CyclingAnalytics token set. Please authorize in Settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1102"/>
-        <source>CyclingAnalytics support isn&apos;t enabled in this build</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1125"/>
-        <source>Error uploading to CyclingAnalytics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1129"/>
-        <source>Successfully uploaded to CyclingAnalytics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1136"/>
-        <source>Upload to CyclingAnalytics...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1185"/>
-        <source>Upload... Sending to CyclingAnalytics</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1194"/>
-        <source>Upload to CyclingAnalytics finished.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1222"/>
-        <source> Error from CyclingAnalytics: </source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">Cycling Analytics</translation>
     </message>
 </context>
 <context>
@@ -7639,18 +8098,18 @@ Click Cancel to exit.</source>
 <context>
     <name>DanielsEquivalentPower</name>
     <message>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="134"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="274"/>
         <source>Daniels EqP</source>
         <translation>Daniels EqP</translation>
     </message>
     <message>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="135"/>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="136"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="275"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="276"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="138"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="278"/>
         <source>Daniels EqP is the constant power which would produce equivalent Daniels Points.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7658,12 +8117,12 @@ Click Cancel to exit.</source>
 <context>
     <name>DanielsPoints</name>
     <message>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="57"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="135"/>
         <source>Daniels Points</source>
         <translation>Daniels Points</translation>
     </message>
     <message>
-        <location filename="../../Metrics/DanielsPoints.cpp" line="61"/>
+        <location filename="../../Metrics/DanielsPoints.cpp" line="139"/>
         <source>Daniels Points adapted for cycling using power instead of pace and assuming VO2max-power=1.2*CP, normalized to assign 100 points to 1 hour at CP.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -7671,8 +8130,8 @@ Click Cancel to exit.</source>
 <context>
     <name>DataFilter</name>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1551"/>
-        <location filename="../../Core/DataFilter.cpp" line="1592"/>
+        <location filename="../../Core/DataFilter.cpp" line="1570"/>
+        <location filename="../../Core/DataFilter.cpp" line="1609"/>
         <source>malformed expression.</source>
         <translation>неправильно составленное выражение.</translation>
     </message>
@@ -7707,86 +8166,94 @@ Click Cancel to exit.</source>
 <context>
     <name>DateSettingsEdit</name>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="209"/>
+        <location filename="../../Core/TimeUtils.cpp" line="213"/>
         <source>Current selection</source>
         <translation>Текущее выделение</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="217"/>
+        <location filename="../../Core/TimeUtils.cpp" line="221"/>
         <source>Current selection thru today</source>
         <translation>Текущее выделение и вплоть до сегодня</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="225"/>
+        <location filename="../../Core/TimeUtils.cpp" line="229"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="234"/>
+        <location filename="../../Core/TimeUtils.cpp" line="238"/>
         <source>to today</source>
         <translation>до сегодня</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="238"/>
+        <location filename="../../Core/TimeUtils.cpp" line="242"/>
         <source>Between</source>
         <translation>Между</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="248"/>
+        <location filename="../../Core/TimeUtils.cpp" line="252"/>
         <source>and</source>
         <translation>и</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="253"/>
+        <location filename="../../Core/TimeUtils.cpp" line="257"/>
         <source>Last</source>
         <translation>Последних</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="263"/>
+        <location filename="../../Core/TimeUtils.cpp" line="267"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="264"/>
+        <location filename="../../Core/TimeUtils.cpp" line="268"/>
         <source>weeks</source>
         <translation>недель</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="265"/>
+        <location filename="../../Core/TimeUtils.cpp" line="269"/>
         <source>months</source>
         <translation>месяцев</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="266"/>
+        <location filename="../../Core/TimeUtils.cpp" line="270"/>
         <source>years</source>
         <translation>лет</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="275"/>
+        <location filename="../../Core/TimeUtils.cpp" line="279"/>
         <source>This</source>
         <translation>Эта/Этот</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="279"/>
+        <location filename="../../Core/TimeUtils.cpp" line="283"/>
         <source>week</source>
         <translation>неделя</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="280"/>
+        <location filename="../../Core/TimeUtils.cpp" line="284"/>
         <source>month</source>
         <translation>месяц</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="281"/>
+        <location filename="../../Core/TimeUtils.cpp" line="285"/>
         <source>year</source>
         <translation>год</translation>
     </message>
     <message>
-        <location filename="../../Core/TimeUtils.cpp" line="292"/>
+        <location filename="../../Core/TimeUtils.cpp" line="296"/>
         <source>prior</source>
         <translation>до</translation>
     </message>
 </context>
+<context>
+    <name>DaumController</name>
+    <message>
+        <location filename="../../Train/DaumController.cpp" line="59"/>
+        <source>Cannot Connect to Daum</source>
+        <translation>Не удаётся соединиться с Daum</translation>
+    </message>
+</context>
 <context>
     <name>DaysScaleDraw</name>
     <message>
@@ -7828,62 +8295,62 @@ Click Cancel to exit.</source>
 <context>
     <name>DefaultsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3404"/>
+        <location filename="../../Gui/Pages.cpp" line="3940"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3405"/>
+        <location filename="../../Gui/Pages.cpp" line="3941"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3416"/>
+        <location filename="../../Gui/Pages.cpp" line="3952"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3417"/>
+        <location filename="../../Gui/Pages.cpp" line="3953"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3418"/>
+        <location filename="../../Gui/Pages.cpp" line="3954"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3419"/>
+        <location filename="../../Gui/Pages.cpp" line="3955"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3430"/>
+        <location filename="../../Gui/Pages.cpp" line="3966"/>
         <source>Field</source>
         <translation>Поле</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3431"/>
+        <location filename="../../Gui/Pages.cpp" line="3967"/>
         <source>Value</source>
         <translation>Значение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3432"/>
+        <location filename="../../Gui/Pages.cpp" line="3968"/>
         <source>Linked field</source>
         <translation>Связанное поле</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3433"/>
+        <location filename="../../Gui/Pages.cpp" line="3969"/>
         <source>Default Value</source>
         <translation>Значение по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3510"/>
+        <location filename="../../Gui/Pages.cpp" line="4046"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3512"/>
+        <location filename="../../Gui/Pages.cpp" line="4048"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -7904,7 +8371,7 @@ Click Cancel to exit.</source>
         <translation>Удалить точки</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFileCommand.cpp" line="674"/>
+        <location filename="../../FileIO/RideFileCommand.cpp" line="678"/>
         <source>Remove XDATA Points</source>
         <translation>Удалить точки XData</translation>
     </message>
@@ -7920,12 +8387,12 @@ Click Cancel to exit.</source>
 <context>
     <name>DevicePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1292"/>
+        <location filename="../../Gui/Pages.cpp" line="1812"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1293"/>
+        <location filename="../../Gui/Pages.cpp" line="1813"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -7938,12 +8405,12 @@ Click Cancel to exit.</source>
         <translation type="vanished">Разрешить несколько устройств в режиме занятия</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1287"/>
+        <location filename="../../Gui/Pages.cpp" line="1807"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1288"/>
+        <location filename="../../Gui/Pages.cpp" line="1808"/>
         <source>-</source>
         <translation>-</translation>
     </message>
@@ -7969,6 +8436,26 @@ Click Cancel to exit.</source>
         <source>Bluetooth Low Energy devices such as KK Inride, Stages PM, Blue HR and Blue SC</source>
         <translation>Работающие по протоколу Bluetooth Low Energy устройства, такие как KK Inride, Stages PM, Blue HR и BlueSC</translation>
     </message>
+    <message>
+        <location filename="../../Train/DeviceTypes.cpp" line="64"/>
+        <source>Kettler Racer serial device </source>
+        <translation>Устройство Kettler Racer, работающее через последовательный порт </translation>
+    </message>
+    <message>
+        <location filename="../../Train/DeviceTypes.cpp" line="67"/>
+        <source>Daum Serial Device </source>
+        <translation>Устройство Daum, работающее через последовательный порт </translation>
+    </message>
+    <message>
+        <location filename="../../Train/DeviceTypes.cpp" line="72"/>
+        <source>Tacx Fortius bike trainer with the handlebar controller connected to a USB port. Please make sure you have device firmware to hand.</source>
+        <translation>Велостанок Tacx Fortius с контроллером, подключенным через USB-порт. Убедитесь, что прошивка устройства обновлена.</translation>
+    </message>
+    <message>
+        <location filename="../../Train/DeviceTypes.cpp" line="76"/>
+        <source>Tacx iMagic bike trainer with the handlebar controller connected to a USB port.</source>
+        <translation>Велостанок iMagic с контроллером, подключенным через USB-порт. Убедитесь, что прошивка устройства обновлена.</translation>
+    </message>
     <message>
         <source>The Wahoo Fitness Kickr cycling trainer via its Bluetooth smart interface. </source>
         <translation type="vanished">Велостанок Wahoo Fitness Kickr по интерфейсу Bluetooth Smart.  </translation>
@@ -7981,20 +8468,19 @@ Click Cancel to exit.</source>
     <message>
         <location filename="../../Train/DeviceTypes.cpp" line="58"/>
         <source>Monark USB device </source>
-        <translation>USB устройство Monark</translation>
+        <translation>USB устройство Monark </translation>
     </message>
     <message>
         <location filename="../../Train/DeviceTypes.cpp" line="61"/>
         <source>Kettler serial device </source>
-        <translation>Устройство Kettler, работающее через последовательный порт</translation>
+        <translation>Устройство Kettler, работающее через последовательный порт </translation>
     </message>
     <message>
-        <location filename="../../Train/DeviceTypes.cpp" line="66"/>
         <source>Tacx Fortius/iMagic bike trainer with the handlebar controller connected to a USB port. Please make sure you have device firmware to hand.</source>
-        <translation>Велостанок Tacx Fortius/iMagic с контроллером, подключенным через USB-порт. Убедитесь, что прошивка устройства обновлена.</translation>
+        <translation type="vanished">Велостанок Tacx Fortius/iMagic с контроллером, подключенным через USB-порт. Убедитесь, что прошивка устройства обновлена.</translation>
     </message>
     <message>
-        <location filename="../../Train/DeviceTypes.cpp" line="72"/>
+        <location filename="../../Train/DeviceTypes.cpp" line="82"/>
         <source>Testing device used for development only. If an ERG file is selected it will replay back, with a little randomness thrown in.</source>
         <translation>Тестовое устройство только для разработки. Если выбран файл ERG, он будет воспроизведён с небольшим добавлением случайных значений.</translation>
     </message>
@@ -8020,75 +8506,58 @@ Click Cancel to exit.</source>
         <translation>Календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="54"/>
         <source>Summary</source>
-        <translation>Сводка</translation>
+        <translation type="vanished">Сводка</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="94"/>
         <source>Day Summary</source>
-        <translation>Сводка за день</translation>
+        <translation type="vanished">Сводка за день</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="95"/>
         <source>Weekly Summary</source>
-        <translation>Сводка за неделю</translation>
+        <translation type="vanished">Сводка за неделю</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="96"/>
         <source>Monthly Summary</source>
-        <translation>Сводка за месяц</translation>
+        <translation type="vanished">Сводка за месяц</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="364"/>
         <source>Totals</source>
-        <translation>Всего</translation>
+        <translation type="vanished">Всего</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="369"/>
         <source>Averages</source>
-        <translation>Средние значения</translation>
+        <translation type="vanished">Средние значения</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="374"/>
         <source>Maximums</source>
-        <translation>Макс. значения</translation>
+        <translation type="vanished">Макс. значения</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="379"/>
         <source>Metrics</source>
-        <translation>Показатели</translation>
+        <translation type="vanished">Показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="401"/>
-        <source>^(Average|Max) </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="405"/>
         <source>seconds</source>
-        <translation>секунд</translation>
+        <translation type="vanished">секунд</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="441"/>
         <source>Day of </source>
-        <translation type="unfinished">День </translation>
+        <translation type="obsolete">День </translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="441"/>
-        <location filename="../../Gui/DiarySidebar.cpp" line="443"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="666"/>
         <source>dddd MMMM d</source>
-        <translation type="unfinished"></translation>
+        <translation>dddd MMMM d</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="443"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="666"/>
         <source>Week Commencing %1</source>
         <translation>Неделя, начинающаяся с %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="445"/>
         <source>MMMM yyyy</source>
-        <translation>MMMM yyyy</translation>
+        <translation type="vanished">MMMM yyyy</translation>
     </message>
 </context>
 <context>
@@ -8106,12 +8575,12 @@ Click Cancel to exit.</source>
     <message>
         <location filename="../../Metrics/SwimMetrics.cpp" line="56"/>
         <source>yd</source>
-        <translation>я</translation>
+        <translation>ярд</translation>
     </message>
     <message>
         <location filename="../../Metrics/SwimMetrics.cpp" line="59"/>
         <source>Total Distance in meters or yards</source>
-        <translation type="unfinished"></translation>
+        <translation>Общая дистанция в метрах или ярдах</translation>
     </message>
 </context>
 <context>
@@ -8171,62 +8640,62 @@ then click &quot;Rescan&quot; to check again.</source>
         <translation>, затем нажмите «Загрузить».</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="305"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="312"/>
         <source>Getting list ...</source>
         <translation>Получение списка...</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="308"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="315"/>
         <source>Get list failed</source>
         <translation>Получить список не удалось</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="460"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="467"/>
         <source>The activity %1 could not be converted to GoldenCheetah .JSON file format.</source>
         <translation>Тренировка %1 не может быть скорвертирована в формат GoldenCheetah .JSON.</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="325"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="332"/>
         <source>Starting Download ...</source>
         <translation>Запуск закгрузки...</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="329"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="336"/>
         <source>Download cancelled</source>
         <translation>Загрузка прервана</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="359"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="366"/>
         <source>File %1 has no valid timestamp, falling back to &apos;now&apos;</source>
         <translation>Файл %1 не имеет корректной метки времени, будет использовано время «сейчас»</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="371"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="378"/>
         <source>Activity Already Downloaded</source>
         <translation>Эта тренировка уже скачана</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="372"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="379"/>
         <source>The activity starting at %1 appears to have already been downloaded.  Do you want to overwrite the previous download?</source>
         <translation>Тренировка, начавшаяся в %1, скорее всего уже скачана. Вы хотите перезаписать предыдущее скачивание?</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="413"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="420"/>
         <source>Failed to rename %1 to %2</source>
         <translation>Не удалось переименовать %1 в %2</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="463"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="470"/>
         <source>.JSON conversion error: file %1</source>
         <translation>Ошибка преобразования в .JSON: файл %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="484"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="491"/>
         <source>Download completed</source>
         <translation>Скачивание завершено</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="515"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="522"/>
         <source>Cleaned data</source>
         <translation type="unfinished">Данные очищены</translation>
     </message>
@@ -8264,50 +8733,50 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
         <translation>Ошибка загрузки драйвера устройства</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="330"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="337"/>
         <source>Cancel clicked by user.</source>
         <translation>Отменено пользователем.</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="334"/>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="336"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="341"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="343"/>
         <source>Download failed</source>
         <translation>Загрузка не удалась</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="391"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="398"/>
         <source>Failed to remove existing file %1: %2</source>
         <translation>Невозможно удалить существующий файл %1: %2</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="395"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="402"/>
         <source>failed to rename %1 to %2</source>
         <translation>невозможно переименовать %1 в %2</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="409"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="416"/>
         <source>Failed to rename %1 to %2: %3</source>
         <translation>Невозможно переименовать %1 в %2: %3</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="376"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="383"/>
         <source>&amp;Overwrite</source>
         <translation>&amp;Переписать</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="376"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="383"/>
         <source>&amp;Skip</source>
         <translation>П&amp;ропустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="379"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="386"/>
         <source>skipped file %1</source>
         <translation>пропущен файл %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="390"/>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="408"/>
-        <location filename="../../Gui/DownloadRideDialog.cpp" line="459"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="397"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="415"/>
+        <location filename="../../Gui/DownloadRideDialog.cpp" line="466"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
@@ -8315,38 +8784,44 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>Dropbox</name>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="65"/>
         <source>Network Problem reading Dropbox data</source>
-        <translation>Проблемы с сетью при чтении данных Dropbox</translation>
+        <translation type="vanished">Проблемы с сетью при чтении данных Dropbox</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="85"/>
         <source>invalid root path.</source>
-        <translation>Неверный корневой каталог.</translation>
+        <translation type="vanished">Неверный корневой каталог.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="86"/>
         <source>root is not a directory.</source>
-        <translation>корневой каталог не является директорией.</translation>
+        <translation type="vanished">корневой каталог не является директорией.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="89"/>
         <source>problem parsing Dropbox data</source>
-        <translation>проблема с разбором данных от Dropbox</translation>
+        <translation type="vanished">проблема с разбором данных от Dropbox</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="142"/>
+        <location filename="../../Cloud/Dropbox.cpp" line="68"/>
+        <source>Problem accessing Dropbox data</source>
+        <translation>Проблема с доступом к данным Dropbox</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Dropbox.cpp" line="130"/>
         <source>You must authorise with Dropbox first</source>
         <translation>Сначала необходимо авторизоваться в Dropbox</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="271"/>
-        <location filename="../../Cloud/Dropbox.cpp" line="290"/>
+        <location filename="../../Cloud/Dropbox.cpp" line="199"/>
+        <source>Parsing Error: %1</source>
+        <translation>Ошибка обработки: %1</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Dropbox.cpp" line="287"/>
+        <location filename="../../Cloud/Dropbox.cpp" line="306"/>
         <source>Completed.</source>
         <translation>Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.cpp" line="275"/>
+        <location filename="../../Cloud/Dropbox.cpp" line="291"/>
         <source>Network Error - Upload failed.</source>
         <translation>Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
@@ -8355,25 +8830,25 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
         <translation type="vanished">Облачное хранилище Dropbox</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.h" line="36"/>
+        <location filename="../../Cloud/Dropbox.h" line="37"/>
         <source>Dropbox</source>
-        <translation type="unfinished">Dropbox</translation>
+        <translation>Dropbox</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Dropbox.h" line="37"/>
+        <location filename="../../Cloud/Dropbox.h" line="38"/>
         <source>Sync activities via your cloud storage.</source>
-        <translation type="unfinished"></translation>
+        <translation>Синхронизировать тренировки с вашим облачным хранилищем.</translation>
     </message>
 </context>
 <context>
     <name>EOA</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2446"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2504"/>
         <source>Effect of Altitude</source>
         <translation>Влияние высоты</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2450"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2508"/>
         <source>Relationship between altitude adjusted power and recorded power</source>
         <translation type="unfinished"></translation>
     </message>
@@ -8415,17 +8890,22 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>EditIntervalDialog</name>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="178"/>
+        <location filename="../../Core/IntervalItem.cpp" line="185"/>
         <source>Edit Interval</source>
         <translation>Изменить интервал</translation>
     </message>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="219"/>
+        <location filename="../../Core/IntervalItem.cpp" line="207"/>
+        <source>Performance Test</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/IntervalItem.cpp" line="230"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="220"/>
+        <location filename="../../Core/IntervalItem.cpp" line="231"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тмена</translation>
     </message>
@@ -8433,121 +8913,126 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>EditMetricDetailDialog</name>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1942"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1992"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1943"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1993"/>
         <source>Axis Label / Units</source>
         <translation>Подпись / Единица измерения</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1573"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1593"/>
         <source>Curve Settings</source>
         <translation>Параметры данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1547"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1554"/>
         <source>Estimate %1 %2 Power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1551"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1558"/>
         <source>Endurance Index</source>
         <translation>Выносливость</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1552"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1559"/>
         <source>Vo2Max Estimate</source>
         <translation>Оценка VO₂ макс</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1581"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1601"/>
         <source>Metric</source>
         <translation>Показатель</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1582"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1602"/>
         <source>Best</source>
         <translation>Лучшие</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1583"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1603"/>
         <source>Estimate</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1584"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1604"/>
         <source>Stress</source>
         <translation>Нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1585"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1605"/>
         <source>Formula</source>
         <translation>Формула</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1640"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1723"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1606"/>
+        <source>Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/LTMTool.cpp" line="1667"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1750"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1641"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1724"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1668"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1751"/>
         <source>minutes</source>
         <translation>минут</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1642"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1725"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1669"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1752"/>
         <source>hours</source>
         <translation>часов</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1679"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1772"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1706"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1799"/>
         <source>Peak</source>
         <translation>Пиковое значение</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1737"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1764"/>
         <source>Absolute</source>
         <translation>В абсолюте</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1738"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1765"/>
         <source>Per Kilogram</source>
         <translation>На килограмм</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1769"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1796"/>
         <source>Total</source>
         <translation type="unfinished">Всего</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1770"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1797"/>
         <source>Running Total</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1771"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1798"/>
         <source>Average</source>
         <translation type="unfinished">Среднее</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1773"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1800"/>
         <source>Low</source>
         <translation type="unfinished">Минимальное</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1776"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1803"/>
         <source>Aggregate:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1784"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1811"/>
         <source># type in a formula to use
 # for e.g. BikeStress / Duration
 # as you type the available metrics
@@ -8560,217 +9045,232 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 </translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1869"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1896"/>
         <source>Short Term Stress (STS/ATL)</source>
         <translation>Краткосрочная нагрузка (STS/ATL)</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1870"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1897"/>
         <source>Long Term Stress  (LTS/CTL)</source>
         <translation>Длительная нагрузка (LTS/CTL)</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1871"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1898"/>
         <source>Stress Balance    (SB/TSB)</source>
         <translation>Баланс нагрузки (SB/TSB)</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1872"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1899"/>
         <source>Stress Ramp Rate  (RR)</source>
         <translation>Скорость изменения нагрузки (RR)</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1880"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1907"/>
         <source>Stress Type</source>
         <translation>Тип нагрузки</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1908"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1935"/>
         <source>Metadata Field</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1909"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1936"/>
         <source>PMC metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1938"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1961"/>
+        <source>Measure Group</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/LTMTool.cpp" line="1969"/>
+        <source>Measure Field</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/LTMTool.cpp" line="1988"/>
         <source>Filter</source>
         <translation type="unfinished">Фильтр</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1949"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1999"/>
         <source>Style</source>
         <translation>Стиль</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1951"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2001"/>
         <source>Bar</source>
         <translation>Столбики</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1952"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2002"/>
         <source>Line</source>
         <translation>Линии</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1953"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2003"/>
         <source>Sticks</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1954"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2004"/>
         <source>Dots</source>
         <translation>Точки</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1957"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2007"/>
         <source>Stack</source>
         <translation>Показывать раздельно</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1962"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2012"/>
         <source>Symbol</source>
         <translation>Символ</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1964"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2014"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1965"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2015"/>
         <source>Circle</source>
         <translation>Круг</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1966"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2016"/>
         <source>Square</source>
         <translation>Квадрат</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1967"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2017"/>
         <source>Diamond</source>
         <translation>Ромб</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1968"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2018"/>
         <source>Triangle</source>
         <translation>Треугольник</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1969"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2019"/>
         <source>Cross</source>
         <translation>Крест</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1970"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2020"/>
         <source>Hexagon</source>
         <translation>Шестиугольник</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1971"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2021"/>
         <source>Star</source>
         <translation>Звезда</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1974"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2024"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1977"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2027"/>
         <source>Fill curve</source>
         <translation>Выполнять заливку кривых</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1981"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2031"/>
         <source>Data labels</source>
         <translation>Подписывать данные</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1988"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2038"/>
         <source>Highlight Highest</source>
         <translation>Выделять самые высокие значения</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1996"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2046"/>
         <source>Highlight Lowest</source>
         <translation>Выделять самые низкие значения</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2004"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2054"/>
         <source>Highlight Outliers</source>
         <translation>Выделять резко отклоняющиеся</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2012"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2062"/>
         <source>Baseline</source>
         <translation>Точка отсчёта</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2020"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2070"/>
         <source>Smooth Curve</source>
         <translation>Сглаживать кривую</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2024"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2074"/>
         <source>No trend Line</source>
         <translation>Без линии динамики</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2025"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2075"/>
         <source>Linear Trend</source>
         <translation>Линейная динамика</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2026"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2076"/>
         <source>Quadratic Trend</source>
         <translation>Квадратичная динамика</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2027"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2077"/>
         <source>Moving Average</source>
         <translation>Скользящее среднее</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2028"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2078"/>
         <source>Simple Average</source>
         <translation>Простое среднее</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2073"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2123"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2074"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2124"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2203"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2274"/>
         <source>Peak %1</source>
         <translation>Пик %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2205"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2276"/>
         <source> second </source>
         <translation> секунда </translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2206"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2277"/>
         <source> minute </source>
         <translation> минута </translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2208"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2279"/>
         <source> hour </source>
         <translation> час </translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="2398"/>
+        <location filename="../../Charts/LTMTool.cpp" line="2299"/>
+        <source>%1 - %2</source>
+        <translation>%1 - %2</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/LTMTool.cpp" line="2493"/>
         <source>Choose Metric Color</source>
         <translation>Выберите цвет показателя</translation>
     </message>
@@ -8817,72 +9317,72 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>EditPhaseDialog</name>
     <message>
-        <location filename="../../Core/Season.cpp" line="572"/>
+        <location filename="../../Core/Season.cpp" line="644"/>
         <source>Edit Date Range</source>
         <translation>Изменить диапазон дат</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="577"/>
+        <location filename="../../Core/Season.cpp" line="649"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="578"/>
+        <location filename="../../Core/Season.cpp" line="650"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="579"/>
+        <location filename="../../Core/Season.cpp" line="651"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="580"/>
+        <location filename="../../Core/Season.cpp" line="652"/>
         <source>To</source>
         <translation>До</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="581"/>
+        <location filename="../../Core/Season.cpp" line="653"/>
         <source>Starting LTS</source>
         <translation>Начальный LTS</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="582"/>
+        <location filename="../../Core/Season.cpp" line="654"/>
         <source>Lowest SB</source>
         <translation>Самый низкий SB</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="588"/>
+        <location filename="../../Core/Season.cpp" line="660"/>
         <source>Phase</source>
         <translation>Фаза</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="589"/>
+        <location filename="../../Core/Season.cpp" line="661"/>
         <source>Prep</source>
         <translation>Подготовка</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="590"/>
+        <location filename="../../Core/Season.cpp" line="662"/>
         <source>Base</source>
         <translation>Базовая</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="591"/>
+        <location filename="../../Core/Season.cpp" line="663"/>
         <source>Build</source>
         <translation type="unfinished">Строительство</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="592"/>
+        <location filename="../../Core/Season.cpp" line="664"/>
         <source>Camp</source>
         <translation>Лагерь</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="638"/>
+        <location filename="../../Core/Season.cpp" line="712"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="639"/>
+        <location filename="../../Core/Season.cpp" line="713"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тмена</translation>
     </message>
@@ -8890,62 +9390,62 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>EditSeasonDialog</name>
     <message>
-        <location filename="../../Core/Season.cpp" line="100"/>
+        <location filename="../../Core/Season.cpp" line="124"/>
         <source>Edit Date Range</source>
         <translation>Изменить диапазон дат</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="105"/>
+        <location filename="../../Core/Season.cpp" line="129"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="106"/>
+        <location filename="../../Core/Season.cpp" line="130"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="107"/>
+        <location filename="../../Core/Season.cpp" line="131"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="108"/>
+        <location filename="../../Core/Season.cpp" line="132"/>
         <source>To</source>
         <translation>До</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="109"/>
+        <location filename="../../Core/Season.cpp" line="133"/>
         <source>Starting LTS</source>
         <translation>Начальный LTS</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="110"/>
+        <location filename="../../Core/Season.cpp" line="134"/>
         <source>Lowest SB</source>
         <translation>Самый низкий SB</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="116"/>
+        <location filename="../../Core/Season.cpp" line="140"/>
         <source>Season</source>
         <translation>Сезон</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="117"/>
+        <location filename="../../Core/Season.cpp" line="141"/>
         <source>Cycle</source>
         <translation>Цикл</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="118"/>
+        <location filename="../../Core/Season.cpp" line="142"/>
         <source>Adhoc</source>
         <translation>Специальный</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="164"/>
+        <location filename="../../Core/Season.cpp" line="188"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="165"/>
+        <location filename="../../Core/Season.cpp" line="189"/>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
@@ -8953,27 +9453,37 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>EditSeasonEventDialog</name>
     <message>
-        <location filename="../../Core/Season.cpp" line="199"/>
+        <location filename="../../Core/Season.cpp" line="232"/>
         <source>Edit Event</source>
         <translation>Изменить событие</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="204"/>
+        <location filename="../../Core/Season.cpp" line="237"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="205"/>
+        <location filename="../../Core/Season.cpp" line="238"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="224"/>
+        <location filename="../../Core/Season.cpp" line="239"/>
+        <source>Priority</source>
+        <translation type="unfinished">Приоритет</translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="240"/>
+        <source>Description</source>
+        <translation type="unfinished">Описание</translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="271"/>
         <source>&amp;OK</source>
         <translation>&amp;OK</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="225"/>
+        <location filename="../../Core/Season.cpp" line="272"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тмена</translation>
     </message>
@@ -9199,13 +9709,13 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>ElevationGain</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="692"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="750"/>
         <source>Elevation Gain</source>
         <translation>Набор высоты</translation>
     </message>
     <message>
         <location filename="../../Metrics/BasicRideMetrics.cpp" line="332"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="694"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="752"/>
         <source>meters</source>
         <translation>м</translation>
     </message>
@@ -9216,7 +9726,7 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
     </message>
     <message>
         <location filename="../../Metrics/BasicRideMetrics.cpp" line="333"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="695"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="753"/>
         <source>feet</source>
         <translation>футов</translation>
     </message>
@@ -9226,7 +9736,7 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="697"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="755"/>
         <source>Elevation Gain in meters of feets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9234,22 +9744,22 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>ElevationLoss</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="759"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="817"/>
         <source>Elevation Loss</source>
         <translation>Потеря высоты</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="761"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="819"/>
         <source>meters</source>
         <translation>м</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="762"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="820"/>
         <source>feet</source>
         <translation>футов</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="764"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="822"/>
         <source>Elevation Loss in meters of feets</source>
         <translation type="unfinished"></translation>
     </message>
@@ -9601,113 +10111,113 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
     <message>
         <location filename="../../Metrics/PeakPower.cpp" line="192"/>
         <source>Fatigue Index is power decay from Max Power to Min Power as a percent of Max Power.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Показатель усталости - это снижение мощности от максимальной до минимальной в процентах от максимальной.</translation>
     </message>
 </context>
 <context>
     <name>FieldsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3112"/>
+        <location filename="../../Gui/Pages.cpp" line="3648"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3113"/>
+        <location filename="../../Gui/Pages.cpp" line="3649"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3114"/>
+        <location filename="../../Gui/Pages.cpp" line="3650"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3099"/>
+        <location filename="../../Gui/Pages.cpp" line="3635"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2852"/>
+        <location filename="../../Gui/Pages.cpp" line="3388"/>
         <source>Text</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2853"/>
+        <location filename="../../Gui/Pages.cpp" line="3389"/>
         <source>Textbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2854"/>
+        <location filename="../../Gui/Pages.cpp" line="3390"/>
         <source>ShortText</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2855"/>
+        <location filename="../../Gui/Pages.cpp" line="3391"/>
         <source>Integer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2856"/>
+        <location filename="../../Gui/Pages.cpp" line="3392"/>
         <source>Double</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2857"/>
+        <location filename="../../Gui/Pages.cpp" line="3393"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2858"/>
+        <location filename="../../Gui/Pages.cpp" line="3394"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2859"/>
+        <location filename="../../Gui/Pages.cpp" line="3395"/>
         <source>Checkbox</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3100"/>
+        <location filename="../../Gui/Pages.cpp" line="3636"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3111"/>
+        <location filename="../../Gui/Pages.cpp" line="3647"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3125"/>
+        <location filename="../../Gui/Pages.cpp" line="3661"/>
         <source>Screen Tab</source>
         <translation>Вкладка</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3126"/>
+        <location filename="../../Gui/Pages.cpp" line="3662"/>
         <source>Field</source>
         <translation>Поле</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3127"/>
+        <location filename="../../Gui/Pages.cpp" line="3663"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3128"/>
+        <location filename="../../Gui/Pages.cpp" line="3664"/>
         <source>Values</source>
         <translation>Значения</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3129"/>
+        <location filename="../../Gui/Pages.cpp" line="3665"/>
         <source>Diary</source>
         <translation>Дневник</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3246"/>
+        <location filename="../../Gui/Pages.cpp" line="3782"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3248"/>
+        <location filename="../../Gui/Pages.cpp" line="3784"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -9873,7 +10383,7 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>FilterHrvOutliers</name>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="232"/>
+        <location filename="../../FileIO/FilterHRV.cpp" line="244"/>
         <source>Filter R-R Outliers</source>
         <translation type="unfinished">Фильтр всплесков R-R</translation>
     </message>
@@ -9881,33 +10391,52 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
 <context>
     <name>FilterHrvOutliersConfig</name>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="149"/>
+        <location filename="../../FileIO/FilterHRV.cpp" line="153"/>
         <source>R-R maximum (msec)</source>
-        <translation type="unfinished">R-R максимальный (мсек)</translation>
+        <translation>R-R максимальный (мсек)</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="150"/>
+        <location filename="../../FileIO/FilterHRV.cpp" line="154"/>
         <source>R-R minimum (msec)</source>
-        <translation type="unfinished">R-R минимальный (мсек)</translation>
+        <translation>R-R минимальный (мсек)</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="151"/>
+        <location filename="../../FileIO/FilterHRV.cpp" line="155"/>
         <source>Filter range</source>
-        <translation type="unfinished">Диапазон фильтра</translation>
+        <translation>Диапазон фильтра</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="152"/>
+        <location filename="../../FileIO/FilterHRV.cpp" line="156"/>
         <source>Filter window size (#)</source>
-        <translation type="unfinished">Размер окна фильтра (#)</translation>
+        <translation>Размер окна фильтра (#)</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FilterHRV.cpp" line="182"/>
+        <source>Set Rest Hrv</source>
+        <translation>Установить Rest HRV</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FilterHRV.cpp" line="197"/>
+        <source>Filter R-R outliers (see &quot;R-R flag&quot; in HRV Xdata). Non outliers are marked &quot;1&quot;.
+  - &quot;R-R min and maximum&quot; exclude samples outside (flag -1). Also excluded when filtering range.
+  - &quot;Filter range&quot; of the average within a window (flag 0)
+  - &quot;Filter window size&quot; distance on either side of the current interval
+  - &quot;Set Rest HRV&quot; if checked the computed HRV metrics are set as Rest HRV Measures
+</source>
+        <translation>Фильтр всплесков R-R (см. &quot;флаг R-R в HRV XDATA). Значения без отклонений помечены как &quot;1&quot;.
+  - &quot;R-R максимальный и минимальный&quot; все значения вне этого диапазона будут отсечены (флаг -1). Также исключается при фильтрации диапазона.
+  - &quot;Диапазон фильтра&quot; от среднего значения в предалх окна (флаг 0)
+  - &quot;Размер окна фильтра&quot; - расстояние по обе стороны от текущего интервала
+  - &quot;Установить Rest HRV&quot; - если отмечено, то вычесленные значения HRV будут установленны как Rest HRV в измерениях
+</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FilterHRV.cpp" line="190"/>
         <source>Filter R-R outliers (see &quot;R-R flag&quot; in HRV Xdata). Non outliers are marked &quot;1&quot;.
   - &quot;R-R min and maximum&quot; exclude samples outside (flag -1). Also excluded when filtering range.
   - &quot;Filter range&quot; of the average within a window (flag 0)
   - &quot;Filter window size&quot; distance on either side of the current interval
 </source>
-        <translation type="unfinished">Фильтр всплесков R-R (см. &quot;флаг R-R в HRV XDATA). Значения без отклонений помечены как &quot;1&quot;.
+        <translation type="obsolete">Фильтр всплесков R-R (см. &quot;флаг R-R в HRV XDATA). Значения без отклонений помечены как &quot;1&quot;.
   - &quot;R-R максимальный и минимальный&quot; все значения вне этого диапазона будут отсечены (флаг -1). Также исключается при фильтрации диапазона.
   - &quot;Диапазон фильтра&quot; от среднего значения в предалх окна (флаг 0)
   - &quot;Размер окна фильтра&quot; - расстояние по обе стороны от текущего интервала
@@ -10003,6 +10532,22 @@ You may need to (re)install the FTDI or PL2303 drivers before downloading.</sour
         <translation>Найти</translation>
     </message>
 </context>
+<context>
+    <name>FixAeroPod</name>
+    <message>
+        <location filename="../../FileIO/FixAeroPod.cpp" line="103"/>
+        <source>Set XData.CdA from HR</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>FixAeroPodConfig</name>
+    <message>
+        <location filename="../../FileIO/FixAeroPod.cpp" line="65"/>
+        <source>When recording with an iBike AeroPod (in HR mode) the CdA data is sent as HR. This tool will update the activity file to move the values from HR into the XData.CdA series.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>FixDeriveDistance</name>
     <message>
@@ -10054,7 +10599,7 @@ Some unit doesn&apos;t record distance without a speedometer but record position
 <context>
     <name>FixDerivePower</name>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="158"/>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="192"/>
         <source>Estimate Power Values</source>
         <translation>Оценить мощность</translation>
     </message>
@@ -10066,27 +10611,76 @@ Some unit doesn&apos;t record distance without a speedometer but record position
         <translation type="vanished">Примерно оценить мощность по скорости, набору высоты, весу и т.д.</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="62"/>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="66"/>
         <source>Bike Weight (kg)</source>
         <translation>Вес велосипеда (кг)</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="63"/>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="67"/>
         <source>Crr</source>
         <translation>Crr</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="64"/>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="68"/>
+        <source>CdA</source>
+        <translation type="unfinished">CdA</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="69"/>
+        <source>Draft mult.</source>
+        <translation type="unfinished">Коэфф. драфтинга.</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="70"/>
         <source>Wind (kph)</source>
         <translation>Ветер (км/ч)</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="65"/>
-        <source>, direction</source>
-        <translation>, направление</translation>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="71"/>
+        <source>, heading</source>
+        <translation type="unfinished">, направление</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixDerivePower.cpp" line="130"/>
+        <source>Derive estimated power data based on speed/elevation/weight etc
+
+Bike Weight parameter is added to athlete&apos;s weight to compound total mass, it should include apparel, shoes, etc
+
+CRR parameter is the coefficient of rolling resistance, it depends on tires and surface
+
+CdA parameter is the effective frontal area in m^2, it depends on position and equipment. If 0 estimated from anthropometric data
+
+Draft Mult. parameter is the multiplier to adjust for drafting, 1 is no drafting  and 0.7 seems legit for drafting in a group
+
+wind speed shall be indicated in kph
+wind direction (origin) unit is degrees from -179 to +180 (-90=W, 0=N, 90=E, 180=S)
+Note: if the ride file already contain wind data
+      it will be overridden if wind is entered manually</source>
+        <translation>Оценка мощности основана на скорости, наборе высоты, весе и др. параметрах
+
+Вес велосипеда будет добавлен к весу спортсмена для получения полной массы, включает в себя одежду, обувь и т.д.
+
+CRR (coefficient of rolling resistance) - коэффициент сопротивления качению, зависит от покрышек и поверхности.
+
+CdA - эффективная фронтальная площадь, в мм², Зависит от посадки и экипировки.Если указано 0, то величина будет рассчитываться исходя из антропометрических данных
+
+Коэфф. драфтинга. - коэффициент коррекции драфтинга (езды на колесе), 1 - без драфтинга, 0.7 примерно соответствует езде в группе
+
+Скорость ветра указывается в километрах в час
+
+Направление ветра (доминирующее) указывается в градусах от -179 до +180, где:
+-90 = западный ветер,
+0 = северный,
+90 = восточный,
+180 = южный.
+
+Внимание: если тренировка уже содержит данные по ветру, то они будут переопределены, если данные по ветру будут введены</translation>
+    </message>
+    <message>
+        <source>, direction</source>
+        <translation type="vanished">, направление</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixDerivePower.cpp" line="108"/>
         <source>Derive estimated power data based on speed/elevation/weight etc
 
 Bike Weight parameter is added to athlete&apos;s weight to compound total mass, it should include apparel, shoes, etc
@@ -10096,7 +10690,7 @@ wind speed shall be indicated in kph
 wind direction (origin) unit is degrees from -179 to +180 (-90=W, 0=N, 90=E, 180=S)
 Note: if the ride file already contain wind data
       it will be overridden if wind is entered manually</source>
-        <translation>Оценка мощности основана на скорости, наборе высоты, весе и др. параметрах
+        <translation type="vanished">Оценка мощности основана на скорости, наборе высоты, весе и др. параметрах
 
 Вес велосипеда будет добавлен к весу спортсмена для получения полной массы, включает в себя одежду, обувь и т.д.
 
@@ -10133,15 +10727,25 @@ CRR (coefficient of rolling resistance) - коэффициент сопроти
 <context>
     <name>FixElevation</name>
     <message>
-        <location filename="../../FileIO/FixElevation.cpp" line="95"/>
+        <location filename="../../FileIO/FixElevation.cpp" line="96"/>
         <source>Fix Elevation errors</source>
         <translation>Исправить ошибки подъёма</translation>
     </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="165"/>
+        <source>Fix Elevation Data not possible</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="166"/>
+        <source>The following problem occured: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FixElevationConfig</name>
     <message>
-        <location filename="../../FileIO/FixElevation.cpp" line="63"/>
+        <location filename="../../FileIO/FixElevation.cpp" line="64"/>
         <source>Fix or add elevation data. If elevation data is present it will be removed and overwritten.
 
 INTERNET CONNECTION REQUIRED.</source>
@@ -10322,7 +10926,7 @@ Pool Length (in meters) allows to re-define the field if value is &gt; 0</source
 <context>
     <name>FixPower</name>
     <message>
-        <location filename="../../FileIO/FixPower.cpp" line="106"/>
+        <location filename="../../FileIO/FixPower.cpp" line="120"/>
         <source>Adjust Power Values</source>
         <translation>Скорректировать данные о мощности</translation>
     </message>
@@ -10330,21 +10934,51 @@ Pool Length (in meters) allows to re-define the field if value is &gt; 0</source
 <context>
     <name>FixPowerConfig</name>
     <message>
-        <location filename="../../FileIO/FixPower.cpp" line="51"/>
         <source>Power Adjustment</source>
-        <translation>Коррекция мощности</translation>
+        <translation type="vanished">Коррекция мощности</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixPower.cpp" line="55"/>
+        <location filename="../../FileIO/FixPower.cpp" line="50"/>
+        <source>Percent Adjustment</source>
+        <translation>Корректировать в процентах</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixPower.cpp" line="52"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixPower.cpp" line="67"/>
+        <location filename="../../FileIO/FixPower.cpp" line="54"/>
+        <source>Fix Adjustment</source>
+        <translation>Фиксированное значение</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixPower.cpp" line="56"/>
+        <source>watt</source>
+        <translation>ватт</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixPower.cpp" line="74"/>
+        <source>Adjusting power values allows you to uplift or degrade the power values by a percentage and/or a fix value. It takes two parameters:
+
+Percent Adjustment - this defines percentage  to modify values by. Negative values are supported.
+
+Fix Adjustment - this defines an fix amount  to modify values by. Negative values are supported.
+
+If both parameters are given, first the relative adjustment takes place, then the fix value adjustment is applied on the result.</source>
+        <translation>Вы можете увеличить или уменьшить значения мощности на заданный процент. Для этого необходимо указать всего один параметр:
+
+Корректировать в процентах — процент, на который изменить значения. Вы можете использовать отрицательные числа.
+
+Фиксированное значение — фиксированная величина мощности, на которую изменить значения. Вы можете использовать отрицательные числа.
+
+Если заданы оба параметра, сначала выполняется корректировка в процентах, а затем корректировка фиксированного значения применяется к результату.</translation>
+    </message>
+    <message>
         <source>Adjusting power values allows you to uplift or degrade the power values by a percentage. It takes a single parameter:
 
 Power Adjustment - this defines percentage  to modify values by. Negative values are supported.</source>
-        <translation>Вы можете увеличить или уменьшить значения мощности на заданный процент. Для этого необходимо указать всего один параметр:
+        <translation type="vanished">Вы можете увеличить или уменьшить значения мощности на заданный процент. Для этого необходимо указать всего один параметр:
 
 Коррекция мощности — процент, на который изменить значения. Вы можете использовать отрицательные числа.</translation>
     </message>
@@ -10426,17 +11060,57 @@ Note: if the file already contain wind data it will be overridden if wind is ent
 </translation>
     </message>
 </context>
+<context>
+    <name>FixSmO2</name>
+    <message>
+        <location filename="../../FileIO/FixSmO2.cpp" line="123"/>
+        <source>Fix SmO2 and/or tHb Anomaly</source>
+        <translation>Исправить аномалии SmO₂ и tHb</translation>
+    </message>
+</context>
 <context>
     <name>FixSmO2Config</name>
     <message>
-        <location filename="../../FileIO/FixSmO2.cpp" line="49"/>
         <source>Occasionally SmO2 (%) will erroneously report high values (0% or &gt;100%).
 
 This function will look for spikes/anomalies in SmO2 data and replace the erroneous data by smoothing/interpolating the data from either side of the 3 points in question</source>
-        <translation>Иногда данные SmO₂ (%) содержат ошибочные значения (0% или больше 100%).
+        <translation type="vanished">Иногда данные SmO₂ (%) содержат ошибочные значения (0% или больше 100%).
 
 Этот инструмент ищет аномалии и пики в данных SmO₂ и заменяет ошибочные значения сглаженными, интерполируя соседние данные по трём точкам</translation>
     </message>
+    <message>
+        <location filename="../../FileIO/FixSmO2.cpp" line="51"/>
+        <source>Fix SmO2</source>
+        <translation>Исправить SmO₂</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixSmO2.cpp" line="52"/>
+        <source>Fix tHb</source>
+        <translation>Исправить tHb</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixSmO2.cpp" line="53"/>
+        <source>Max. tHb</source>
+        <translation>Макс. tHb</translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixSmO2.cpp" line="74"/>
+        <source>Occasionally SmO2 (%) and/or tHb (%) will erroneously report missing or high values (SmO2: 0% or &gt;100% / tHb: 0% or &gt; max. tHb parameter). 
+
+ This function will look for those anomalies in SmO2 and tHb data and depending on the configuration replace the erroneous data by smoothing/interpolating the data from either side of the 3 points in question. It takes the following parameters:
+
+Fix SmO2 - check to fix anomalies in SmO2 data 
+Fix tHb - check to fix anomalies in tHb data 
+Max. tHb - any tHb above is considered an outlier 
+</source>
+        <translation>Иногда показания SmO₂ (%) и/или tHb (%) бывают ошибочно большими и иметь пропуски значений (SmO₂: 0% или &gt;100%, tHb: 0% или &gt;Макс. tHb).
+Эта функция будет искать эти аномалии в данных SmO₂ и tHb и в зависимости от заданных параметров сглаживать/интерполировать данные по значениям 3-х точек до и после. Фильр имеет следующие параметры:
+
+Исправить SmO₂ - выберите для исправления аномалий в данных SmO₂
+Исправить tHb -  выберите для исправления аномалий в данных tHb
+Макс. tHb -  любое значение выше этого будет считаться ошибочным 
+</translation>
+    </message>
 </context>
 <context>
     <name>FixSpeed</name>
@@ -10475,9 +11149,8 @@ Moving Average Seconds parameter allows to set the seconds of the MA filter to s
         <translation>Исправить аномальные пики мощности</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FixSmO2.cpp" line="80"/>
         <source>Fix SmO2 Anomaly</source>
-        <translation>Исправить аномальные пики SmO₂</translation>
+        <translation type="vanished">Исправить аномальные пики SmO₂</translation>
     </message>
 </context>
 <context>
@@ -10542,17 +11215,17 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>FolderNameDialog</name>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="613"/>
+        <location filename="../../Cloud/CloudService.cpp" line="674"/>
         <source>Folder Name</source>
         <translation>Название папки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="620"/>
+        <location filename="../../Cloud/CloudService.cpp" line="681"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/CloudService.cpp" line="621"/>
+        <location filename="../../Cloud/CloudService.cpp" line="682"/>
         <source>Create</source>
         <translation>Создать</translation>
     </message>
@@ -10571,12 +11244,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     </message>
     <message>
         <location filename="../../Metrics/RideMetadata.cpp" line="487"/>
-        <location filename="../../Metrics/RideMetadata.cpp" line="556"/>
+        <location filename="../../Metrics/RideMetadata.cpp" line="557"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Metrics/RideMetadata.cpp" line="792"/>
+        <location filename="../../Metrics/RideMetadata.cpp" line="801"/>
         <source>You entered &apos;%1&apos; which is not an expected value.</source>
         <translation>Вы ввели некорректное значение &apos;%1&apos;.</translation>
     </message>
@@ -11090,51 +11763,40 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GarminUploader</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1397"/>
         <source>Garmin Connect</source>
-        <translation>Garmin Connect</translation>
+        <translation type="vanished">Garmin Connect</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1417"/>
         <source>Error uploading to Garmin Connect</source>
-        <translation>Ошибка при загрузке на Garmin Connect</translation>
+        <translation type="vanished">Ошибка при загрузке на Garmin Connect</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1421"/>
         <source>Successfully uploaded to Garmin Connect</source>
-        <translation>Загрузка на Garmin Connect успешно завершена</translation>
+        <translation type="vanished">Загрузка на Garmin Connect успешно завершена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1428"/>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1489"/>
         <source>Login to Garmin Connect...</source>
-        <translation>Авторизация на Garmin Connect...</translation>
+        <translation type="vanished">Авторизация на Garmin Connect...</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1452"/>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1534"/>
         <source>Login to Garmin Connect finished.</source>
-        <translation>Авторизация на Garmin Connect произведена.</translation>
+        <translation type="vanished">Авторизация на Garmin Connect произведена.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1574"/>
         <source>Upload to Garmin Connect...</source>
-        <translation>Загрузка на Garmin Connect...</translation>
+        <translation type="vanished">Загрузка на Garmin Connect...</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1617"/>
         <source>Upload... Sending to Garmin Connect</source>
-        <translation>Загрузка... Данные отправляются на Garmin Connect</translation>
+        <translation type="vanished">Загрузка... Данные отправляются на Garmin Connect</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1628"/>
         <source>Upload to Garmin Connect finished.</source>
-        <translation>Загрузка на Garmin Connect произведена.</translation>
+        <translation type="vanished">Загрузка на Garmin Connect произведена.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1643"/>
         <source> Error from Garmin Connect: </source>
-        <translation> Сообщение об ошибке от Garmin Connect: </translation>
+        <translation type="vanished"> Сообщение об ошибке от Garmin Connect: </translation>
     </message>
 </context>
 <context>
@@ -11231,42 +11893,42 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GcCrashDialog</name>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="78"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="76"/>
         <source>%1 Crash Recovery</source>
         <translation>Восстановление данных после падения %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="116"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="114"/>
         <source>&lt;b&gt;GoldenCheetah appears to have PREVIOUSLY crashed for this athlete. &lt;/b&gt;&lt;br&gt;&lt;br&gt;The report below gives some diagnostic information that will be useful to the developers. Feel free to post this with a short description of what was occurring when the crash happened to the &lt;href a=&quot;https://groups.google.com/forum/?fromgroups=#!forum/golden-cheetah-users&quot;&gt;GoldenCheetah forums&lt;/href&gt;&lt;br&gt;&lt;b&gt;&lt;br&gt;We respect privacy - this log does NOT contain ids, passwords or personal information.&lt;/b&gt;&lt;br&gt;&lt;b&gt;&lt;br&gt;When this dialog is closed the athlete will be opened.&lt;/b&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="152"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="150"/>
         <source>Save Crash Report...</source>
         <translation>Сохранить отчёт о падении...</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="154"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="152"/>
         <source>Close</source>
         <translation>Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="278"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="256"/>
         <source>&lt;p&gt;Build date: %1 %2&lt;br&gt;Build id: %3&lt;br&gt;Version: %4&lt;br&gt;DB Schema: %5&lt;br&gt;Metrics: %7&lt;br&gt;OS: %6&lt;br&gt;</source>
         <translation>&lt;p&gt;Дата сборки: %1 %2&lt;br&gt;ID сборки: %3&lt;br&gt;Версия: %4&lt;br&gt;Версия схемы БД: %5&lt;br&gt;Показатели: %7&lt;br&gt;OS: %6&lt;br&gt;</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="298"/>
-        <source>&lt;table&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;QT&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;QWT&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;%3&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SRMIO&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;OAUTH&lt;/td&gt;&lt;td&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;D2XX&lt;/td&gt;&lt;td&gt;%7&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;QWTPLOT3D&lt;/td&gt;&lt;td&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;KML&lt;/td&gt;&lt;td&gt;%9&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;ICAL&lt;/td&gt;&lt;td&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;USBXPRESS&lt;/td&gt;&lt;td&gt;%11&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;LIBUSB&lt;/td&gt;&lt;td&gt;%12&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;VLC&lt;/td&gt;&lt;td&gt;%13&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;VIDEO&lt;/td&gt;&lt;td&gt;%14&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SAMPLERATE&lt;/td&gt;&lt;td&gt;%15&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SSL&lt;/td&gt;&lt;td&gt;%16&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;R&lt;/td&gt;&lt;td&gt;%17&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;WEBKIT&lt;/td&gt;&lt;td&gt;%18&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;LMFIT&lt;/td&gt;&lt;td&gt;%19&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="276"/>
+        <source>&lt;table&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;QT&lt;/td&gt;&lt;td&gt;%1&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;QWT&lt;/td&gt;&lt;td&gt;%2&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;%3&lt;/td&gt;&lt;td&gt;%4&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SRMIO&lt;/td&gt;&lt;td&gt;%5&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;D2XX&lt;/td&gt;&lt;td&gt;%6&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;KML&lt;/td&gt;&lt;td&gt;%8&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;ICAL&lt;/td&gt;&lt;td&gt;%9&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;USBXPRESS&lt;/td&gt;&lt;td&gt;%10&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;LIBUSB&lt;/td&gt;&lt;td&gt;%11&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;VLC&lt;/td&gt;&lt;td&gt;%12&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;VIDEO&lt;/td&gt;&lt;td&gt;%13&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SAMPLERATE&lt;/td&gt;&lt;td&gt;%14&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;SSL&lt;/td&gt;&lt;td&gt;%15&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;R&lt;/td&gt;&lt;td&gt;%16&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;Python&lt;/td&gt;&lt;td&gt;%18&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;WEBKIT&lt;/td&gt;&lt;td&gt;%17&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;LMFIT&lt;/td&gt;&lt;td&gt;7.0&lt;/td&gt;&lt;/tr&gt;&lt;tr&gt;&lt;td colspan=&quot;2&quot;&gt;LEVMAR&lt;/td&gt;&lt;td&gt;%19&lt;/td&gt;&lt;/tr&gt;&lt;/table&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="517"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="493"/>
         <source>Save Diagnostics</source>
         <translation>Сохранить диагностику</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcCrashDialog.cpp" line="517"/>
+        <location filename="../../Gui/GcCrashDialog.cpp" line="493"/>
         <source>Text File (*.txt)</source>
         <translation>Текстовый файл (*.txt)</translation>
     </message>
@@ -11274,42 +11936,42 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GcMiniCalendar</name>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="525"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="285"/>
         <source>Mon</source>
         <translation>Пн</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="534"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="294"/>
         <source>Tue</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="543"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="303"/>
         <source>Wed</source>
         <translation>Ср</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="552"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="312"/>
         <source>Thu</source>
         <translation>Чт</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="561"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="321"/>
         <source>Fri</source>
         <translation>Пт</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="570"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="330"/>
         <source>Sat</source>
         <translation>Сб</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="579"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="339"/>
         <source>Sun</source>
         <translation>Вс</translation>
     </message>
     <message>
-        <location filename="../../Gui/DiarySidebar.cpp" line="833"/>
+        <location filename="../../Gui/DiarySidebar.cpp" line="593"/>
         <source>MMMM yyyy</source>
         <translation type="unfinished">MMMM yyyy</translation>
     </message>
@@ -11367,9 +12029,8 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Анаэробный TISS</translation>
     </message>
     <message>
-        <location filename="../../Core/GcUpgrade.cpp" line="285"/>
         <source>BikeStress</source>
-        <translation>BikeStress</translation>
+        <translation type="vanished">BikeStress</translation>
     </message>
     <message>
         <location filename="../../Core/GcUpgrade.cpp" line="411"/>
@@ -11411,6 +12072,11 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <source>%1 configuration files moved to subdirectory: %2 - %3 failed</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../Core/GcUpgrade.cpp" line="285"/>
+        <source>TSS</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="../../Core/GcUpgrade.cpp" line="468"/>
         <source>Start copying of: Calendar files...</source>
@@ -11609,17 +12275,17 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GcWindowDialog</name>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1140"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1143"/>
         <source>Chart Setup</source>
         <translation>Настройка графиков</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1188"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1191"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1189"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1192"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
@@ -11697,9 +12363,19 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>ЧСС и мощность</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="118"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="103"/>
+        <source>Python Chart</source>
+        <translation>График Python</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="104"/>
+        <source>Python Chart </source>
+        <translation>График Python </translation>
+    </message>
+    <message>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="119"/>
         <source>Web page</source>
-        <translation type="unfinished"></translation>
+        <translation>Web страница</translation>
     </message>
     <message>
         <source>Google Map</source>
@@ -11710,58 +12386,56 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Карта Bing</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="104"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="106"/>
         <source>2d Plot</source>
         <translation>2D-график</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="105"/>
         <source>3d Plot</source>
-        <translation>3D-график</translation>
+        <translation type="vanished">3D-график</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="106"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="107"/>
         <source>Aerolab Chung Analysis</source>
         <translation>Анализ аэродинамики по Чангу</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="107"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="108"/>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="108"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="109"/>
         <source>Navigator</source>
         <translation>Навигатор</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="109"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="110"/>
         <source>Summary</source>
         <translation>Сводка</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="110"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="111"/>
         <source>Telemetry</source>
         <translation>Телеметрия</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="111"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="112"/>
         <source>Workout</source>
         <translation>Тренировка</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="112"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="113"/>
         <source>Realtime</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="113"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="114"/>
         <source>Pedal Stroke</source>
         <translation>Частота педалирования</translation>
     </message>
     <message>
         <location filename="../../Gui/GcWindowRegistry.cpp" line="100"/>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="114"/>
         <source>Map</source>
         <translation>Карта</translation>
     </message>
@@ -11773,20 +12447,15 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     <message>
         <location filename="../../Gui/GcWindowRegistry.cpp" line="102"/>
         <source>R Chart </source>
-        <translation>График R</translation>
+        <translation>График R </translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="115"/>
-        <source>StreetView</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="116"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="117"/>
         <source>Video Player</source>
         <translation>Видеопроигрыватель</translation>
     </message>
     <message>
-        <location filename="../../Gui/GcWindowRegistry.cpp" line="117"/>
+        <location filename="../../Gui/GcWindowRegistry.cpp" line="118"/>
         <source>Workout Editor</source>
         <translation>Редактор тренировок</translation>
     </message>
@@ -11805,132 +12474,147 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Язык:</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="67"/>
+        <location filename="../../Gui/Pages.cpp" line="71"/>
         <source>Language</source>
         <translation>Язык программы</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="69"/>
+        <location filename="../../Gui/Pages.cpp" line="73"/>
         <source>English</source>
         <translation>Английский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="70"/>
+        <location filename="../../Gui/Pages.cpp" line="74"/>
         <source>French</source>
         <translation>Французкий</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="71"/>
+        <location filename="../../Gui/Pages.cpp" line="75"/>
         <source>Japanese</source>
         <translation>Японский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="72"/>
+        <location filename="../../Gui/Pages.cpp" line="76"/>
         <source>Portugese (Brazil)</source>
         <translation>Португальский (Бразилия)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="73"/>
+        <location filename="../../Gui/Pages.cpp" line="77"/>
         <source>Italian</source>
         <translation>Итальянский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="74"/>
+        <location filename="../../Gui/Pages.cpp" line="78"/>
         <source>German</source>
         <translation>Немецкий</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="75"/>
+        <location filename="../../Gui/Pages.cpp" line="79"/>
         <source>Russian</source>
         <translation>Русский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="76"/>
+        <location filename="../../Gui/Pages.cpp" line="80"/>
         <source>Czech</source>
         <translation>Чешский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="77"/>
+        <location filename="../../Gui/Pages.cpp" line="81"/>
         <source>Spanish</source>
         <translation>Испанский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="78"/>
+        <location filename="../../Gui/Pages.cpp" line="82"/>
         <source>Portugese</source>
         <translation>Португальский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="79"/>
+        <location filename="../../Gui/Pages.cpp" line="83"/>
         <source>Chinese (Simplified)</source>
         <translation>Китайский (упрощенный)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="80"/>
+        <location filename="../../Gui/Pages.cpp" line="84"/>
         <source>Chinese (Traditional)</source>
         <translation>Китайский (традиционный)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="81"/>
+        <location filename="../../Gui/Pages.cpp" line="85"/>
         <source>Dutch</source>
-        <translation type="unfinished"></translation>
+        <translation>Голландский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="82"/>
+        <location filename="../../Gui/Pages.cpp" line="86"/>
         <source>Swedish</source>
-        <translation type="unfinished"></translation>
+        <translation>Шведский</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="106"/>
+        <location filename="../../Gui/Pages.cpp" line="110"/>
         <source>Unit</source>
         <translation>Единицы измерения</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="108"/>
+        <location filename="../../Gui/Pages.cpp" line="112"/>
         <source>Metric</source>
         <translation>Метрические</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="109"/>
+        <location filename="../../Gui/Pages.cpp" line="113"/>
         <source>Imperial</source>
         <translation>Имперские</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="130"/>
+        <location filename="../../Gui/Pages.cpp" line="134"/>
         <source>Smart Recording Threshold (secs)</source>
-        <translation>Порог интеллект. записи (сек)</translation>
+        <translation type="unfinished">Порог интеллект. записи (сек)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="143"/>
+        <location filename="../../Gui/Pages.cpp" line="147"/>
         <source>Elevation hysteresis (meters)</source>
         <translation>Гистерезис изменения высоты (метр)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="152"/>
+        <location filename="../../Gui/Pages.cpp" line="156"/>
         <source>W&apos; bal formula</source>
         <translation>Формула баланса W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="180"/>
+        <location filename="../../Gui/Pages.cpp" line="184"/>
         <source>Enable R</source>
         <translation>Включить поддержку языка R</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="191"/>
+        <location filename="../../Gui/Pages.cpp" line="192"/>
+        <source>Enable Python</source>
+        <translation>Включить поддержку языка Python</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="200"/>
+        <source>Share to the OpenData project</source>
+        <translation type="unfinished">Передать все данные (медицинские, персональные) в проект OpenData (США)</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="212"/>
         <source>Athlete Library</source>
         <translation>Библиотека спортсменов</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="210"/>
+        <location filename="../../Gui/Pages.cpp" line="231"/>
         <source>Workout and VideoSync Library</source>
         <translation>Библиотека тренировок</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="230"/>
+        <location filename="../../Gui/Pages.cpp" line="251"/>
         <source>R Installation Directory</source>
         <translation>Директория установки R</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="334"/>
+        <location filename="../../Gui/Pages.cpp" line="270"/>
+        <source>Python Home</source>
+        <translation>Домашняя директория Python</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="394"/>
         <source>R Installation (R_HOME)</source>
         <translation>Директория установки R (R_HOME)</translation>
     </message>
@@ -11943,9 +12627,9 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Диаметр колёс:</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="124"/>
+        <location filename="../../Gui/Pages.cpp" line="128"/>
         <source>Use Garmin Smart Recording</source>
-        <translation>Использовать интеллект. запись Garmin</translation>
+        <translation>Использовать интеллектуальную запись Garmin</translation>
     </message>
     <message>
         <source>Smart Recording Threshold (secs):</source>
@@ -11956,27 +12640,44 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Формула баланса W&apos;:</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="154"/>
+        <location filename="../../Gui/Pages.cpp" line="158"/>
         <source>Differential</source>
         <translation>Дифференциал</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="155"/>
+        <location filename="../../Gui/Pages.cpp" line="159"/>
         <source>Integral</source>
         <translation>Интеграл</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="165"/>
+        <location filename="../../Gui/Pages.cpp" line="169"/>
         <source>Warn for unsaved activities on exit</source>
         <translation>Предупреждать о несохранённых тренировках перед выходом</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="175"/>
+        <location filename="../../Gui/Pages.cpp" line="179"/>
         <source>Enable API Web Services</source>
         <translation>Включить web-сервис API</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="356"/>
+        <location filename="../../Gui/Pages.cpp" line="405"/>
+        <source>Python Installation (PYTHONHOME)</source>
+        <translation type="unfinished">Установка Python (PYTHONHOME)</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="414"/>
+        <source>Invalid Folder</source>
+        <translation type="unfinished">Ошибочная директория</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="414"/>
+        <source>Python does not appear to be installed in that location.
+</source>
+        <translation type="unfinished">Python не найден по указанному пути.
+</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="439"/>
         <source>Select Athlete Library</source>
         <translation>Выберите библиотеку спортсменов</translation>
     </message>
@@ -11997,9 +12698,10 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Библиотека тренировок:</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="195"/>
-        <location filename="../../Gui/Pages.cpp" line="213"/>
-        <location filename="../../Gui/Pages.cpp" line="233"/>
+        <location filename="../../Gui/Pages.cpp" line="216"/>
+        <location filename="../../Gui/Pages.cpp" line="234"/>
+        <location filename="../../Gui/Pages.cpp" line="254"/>
+        <location filename="../../Gui/Pages.cpp" line="273"/>
         <source>Browse</source>
         <translation>Обзор</translation>
     </message>
@@ -12036,7 +12738,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">SB</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="345"/>
+        <location filename="../../Gui/Pages.cpp" line="428"/>
         <source>Select Workout Library</source>
         <translation>Выберите библиотеку тренировок</translation>
     </message>
@@ -12150,23 +12852,23 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GoogleDrive</name>
     <message>
-        <location filename="../../Cloud/GoogleDrive.cpp" line="280"/>
+        <location filename="../../Cloud/GoogleDrive.cpp" line="284"/>
         <source>You must authorise with GoogleDrive first</source>
         <translation>Вы должны вначале авторизоваться на GoogleDrive</translation>
     </message>
     <message>
-        <location filename="../../Cloud/GoogleDrive.cpp" line="297"/>
+        <location filename="../../Cloud/GoogleDrive.cpp" line="301"/>
         <source>No such directory, try setting a new location in options.</source>
         <translation>Директории не существует, укажите новое размещение в настройках.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/GoogleDrive.cpp" line="617"/>
-        <location filename="../../Cloud/GoogleDrive.cpp" line="633"/>
+        <location filename="../../Cloud/GoogleDrive.cpp" line="621"/>
+        <location filename="../../Cloud/GoogleDrive.cpp" line="637"/>
         <source>Completed.</source>
         <translation>Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/GoogleDrive.cpp" line="621"/>
+        <location filename="../../Cloud/GoogleDrive.cpp" line="625"/>
         <source>Upload failed</source>
         <translation>Загрузка на сервис не удалась</translation>
     </message>
@@ -12175,12 +12877,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Облачное хранилище Google Drive</translation>
     </message>
     <message>
-        <location filename="../../Cloud/GoogleDrive.h" line="43"/>
+        <location filename="../../Cloud/GoogleDrive.h" line="44"/>
         <source>Google Drive</source>
         <translation type="unfinished">Google Drive</translation>
     </message>
     <message>
-        <location filename="../../Cloud/GoogleDrive.h" line="44"/>
+        <location filename="../../Cloud/GoogleDrive.h" line="45"/>
         <source>Sync your data via your cloud storage.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -12203,12 +12905,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>Gradient</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2491"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2549"/>
         <source>Gradient</source>
         <translation>Градиент</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2496"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2554"/>
         <source>Elevation Gain to Total Distance percent ratio</source>
         <translation>Процент соотношения высоты подъёма к общему расстоянию</translation>
     </message>
@@ -12270,187 +12972,187 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>GroupByModel</name>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="802"/>
-        <location filename="../../Gui/RideNavigator.cpp" line="813"/>
-        <location filename="../../Gui/RideNavigator.cpp" line="827"/>
-        <location filename="../../Gui/RideNavigator.cpp" line="849"/>
-        <location filename="../../Gui/RideNavigator.cpp" line="891"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="803"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="814"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="828"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="850"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="892"/>
         <source>Zero or not present</source>
         <translation>Отсутствует или равно 0</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="803"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="804"/>
         <source>Low Stress</source>
         <translation>Низкая нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="804"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="805"/>
         <source>Medium Stress</source>
         <translation>Средняя нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="805"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="806"/>
         <source>High Stress</source>
         <translation>Высокая нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="806"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="807"/>
         <source>Very High Stress</source>
         <translation>Очень высокая нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="814"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="815"/>
         <source>Active Recovery</source>
         <translation>Активное восстановление</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="815"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="816"/>
         <source>Endurance</source>
         <translation>Аэробная нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="816"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="817"/>
         <source>Tempo</source>
         <translation>Темповая работа</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="817"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="818"/>
         <source>Threshold</source>
         <translation>ПАНО</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="818"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="819"/>
         <source>VO2Max</source>
         <translation>VO₂ макс</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="819"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="820"/>
         <source>Anaerobic Capacity</source>
         <translation>Анаэробная нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="820"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="821"/>
         <source>Maximal</source>
         <translation>Нейромышечная работа</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="828"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="829"/>
         <source>Isopower</source>
         <translation>Неизменная мощность</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="829"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="830"/>
         <source>Steady</source>
         <translatorcomment>*близкая к постоянной</translatorcomment>
         <translation>Стабильная мощность</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="830"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="831"/>
         <source>Variable</source>
         <translation>Вариативная</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="831"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="832"/>
         <source>Highly Variable</source>
         <translation>Сильно варьирующаяся</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="838"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="839"/>
         <source>Less than an hour</source>
         <translation>Меньше 1 часа</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="839"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="840"/>
         <source>Less than 90 minutes</source>
         <translation>Меньше 90 минут</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="840"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="841"/>
         <source>Less than 3 hours</source>
         <translation>Меньше 3 часов</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="841"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="842"/>
         <source>Less than 5 hours</source>
         <translation>Меньше 5 часов</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="842"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="843"/>
         <source>More than 5 hours</source>
         <translation>Больше 5 часов</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="850"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="851"/>
         <source>Short</source>
         <translation>Короткие</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="851"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="852"/>
         <source>Medium</source>
         <translation>Средние</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="852"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="853"/>
         <source>Long</source>
         <translation>Длинные</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="853"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="854"/>
         <source>Very Long</source>
         <translation>Очень длинные</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="882"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="883"/>
         <source>Undefined</source>
         <translation>неопределено</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="892"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="893"/>
         <source>Best 10</source>
         <translation>Лучшие 10</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="893"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="894"/>
         <source>Quartile 1:  0% -  25%</source>
         <translation>Квартиль 1:  0% -  25%</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="894"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="895"/>
         <source>Quartile 2: 25% -  50%</source>
         <translation>Квартиль 2: 25% -  50%</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="895"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="896"/>
         <source>Quartile 3: 50% -  75%</source>
         <translation>Квартиль 3: 50% -  75%</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="896"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="897"/>
         <source>Quartile 4: 75% - 100%</source>
         <translation>Квартиль 4: 75% - 100%</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="900"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="901"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="908"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="909"/>
         <source>This week</source>
         <translation>На этой неделе</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="911"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="912"/>
         <source>This month</source>
         <translation>В этом месяце</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="914"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="915"/>
         <source>Last month</source>
         <translation>В последнем месяце</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="916"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="917"/>
         <source>yyyy-MM (MMMM)</source>
         <translation>yyyy-MM (MMMM)</translation>
     </message>
@@ -12491,18 +13193,18 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HeartBeats</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1325"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1383"/>
         <source>Heartbeats</source>
         <translation>Ударов сердца</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1326"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1327"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1384"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1385"/>
         <source>beats</source>
         <translation>ударов</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1329"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1387"/>
         <source>Total Heartbeats</source>
         <translation>Всего ударов сердца</translation>
     </message>
@@ -12626,11 +13328,6 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <source>All functions related to sharing of activities with cloud services</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="126"/>
-        <source>Downloading of Body Measures (e.g. weight) from multiple sources</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="128"/>
         <source>Calculation of VDOT and Threshold Pace according to Daniels&apos; Running Formula</source>
@@ -12724,304 +13421,314 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     <message>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="171"/>
         <source>Filter R-R outliers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Фильтр всплесков R-R</translation>
     </message>
     <message>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="173"/>
+        <source>Fix SmO2/tHb outliers</source>
+        <translation type="unfinished">Исправить всплески SmO₂ и tHb</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="175"/>
         <source>Options to show/hide views (e.g. Sidebar) as well as adding charts and resetting chart layouts to factory settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="175"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="177"/>
         <source>Help options of GoldenCheetah</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="179"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="181"/>
         <source>Full configurable chart type to track performance and trends for metrics, user-definable best durations and model estimates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="181"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="183"/>
         <source>Date range, data grouping settings which apply to a single chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="185"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="187"/>
         <source>Curves which are plotted for the specific chart - based on presets or individually added and modified here</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="187"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="189"/>
         <source>Individual curve configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="189"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="191"/>
         <source>User defined formulas</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="192"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="194"/>
         <source>Tree map visulation of activity data by two selectable dimensions for a configurable metric</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="201"/>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="230"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="203"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="232"/>
         <source>Distribution of activity data samples or metrics according time spent in a certain segment</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="209"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="211"/>
         <source>Detailed information of a single activity - the metrics shown here are configurable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="213"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="215"/>
         <source>Editor for activity file data - allowing to change/correct data, find entries and find anomalies</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="216"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="218"/>
         <source>Plot of all activity data series in various ways</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="220"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="222"/>
         <source>Selection of all additional curves to be shown in the diagram - plotted only in case data is available in the activity file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="234"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="236"/>
         <source>Analysis of heartrate vs. power along the activity data</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="236"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="238"/>
         <source>Map of activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="238"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="240"/>
         <source>Configurable 2D scatter plot of the current activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="240"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="242"/>
         <source>Configurable 3D plot of the current activity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="251"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="253"/>
         <source>Predefined and configurable set of data ranges for selection of activities to be analysed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="257"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="259"/>
         <source>Powerful filter and search engine to determine the activities which are considered in diagram</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="263"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="265"/>
         <source>Configurable list of activities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="273"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="275"/>
         <source>Entry field for sophisticated Searching and Filtering of activities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="275"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="277"/>
         <source>Adding intervals to an activity using simple query methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="297"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="299"/>
         <source>Automatic Interval Detection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="303"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="305"/>
         <source>Definition of coloring rules for activities</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="195"/>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="223"/>
-        <source>Critical Mean Maximal Power Curve</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="183"/>
-        <source>Predefined sets of curves which can be applied as chart definition, or as starting point for individual adjustments</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="197"/>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="225"/>
-        <source>Basic configuration like date range, what series to use and how to plot</source>
+        <source>Critical Mean Maximal Power Curve</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="126"/>
+        <source>Downloading of Body Measurements (e.g. weight) from multiple sources</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="185"/>
+        <source>Predefined sets of curves which can be applied as chart definition, or as starting point for individual adjustments</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="199"/>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="227"/>
+        <source>Basic configuration like date range, what series to use and how to plot</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="201"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="229"/>
         <source>Configuration of the CP Model to be used to plot the curve</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="203"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="205"/>
         <source>Definition which date range is used for this particular chart</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="205"/>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="261"/>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="267"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="207"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="263"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="269"/>
         <source>Calendar</source>
         <translation type="unfinished">Календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="207"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="209"/>
         <source>Configurable activity log - with build in search capabilities</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="218"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="220"/>
         <source>Selection how the power data series is shown in the plot and general settings on the diagram structure</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="232"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="234"/>
         <source>Quadrant analysis of pedal velocity vs. effective pedal force</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="242"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="244"/>
         <source>Chung&apos;s Aerolab analysis</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="245"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="247"/>
         <source>Overview/summary of the selected data range - data shown in &apos;Athlete&apos;s Best&apos; are configurable</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="247"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="249"/>
         <source>Chart specific filter/search and date range settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="253"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="255"/>
         <source>Definition of points in time &apos;Events&apos; which are marked explicitely on time related diagrams</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="255"/>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="269"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="257"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="271"/>
         <source>Simple summary view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="259"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="261"/>
         <source>Alternative access to the charts created for the main view</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="265"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="267"/>
         <source>Display the available and add new intervals using simple query methods</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="279"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="281"/>
         <source>General</source>
         <translation>Общие</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="281"/>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="283"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="285"/>
         <source>Athlete</source>
         <translation>Спортсмен</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="285"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="287"/>
         <source>Training Zone definition for power</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="287"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="289"/>
         <source>Training Zone definition for heartrate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="289"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="291"/>
         <source>Training Zone definition for Swim and Run</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="291"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="293"/>
         <source>Autoimport</source>
         <translation>Автоимпорт</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="293"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="295"/>
         <source>Passwords</source>
         <translation>Пароли</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="295"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="297"/>
         <source>Appearance</source>
         <translation>Внешний вид</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="299"/>
         <location filename="../../Gui/HelpWhatsThis.cpp" line="301"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="303"/>
         <source>Data Fields</source>
         <translation>Поля данных</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="305"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="307"/>
         <source>Definition of default value(s) for data fields</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="307"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="309"/>
         <source>Definition of processing default parameters for the fix, adjust,... tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="309"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="311"/>
         <source>Metrics</source>
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="311"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="313"/>
         <source>Metrics shown in &apos;Bests&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="313"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="315"/>
         <source>Metrics shown in &apos;Summary&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="315"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="317"/>
         <source>Metrics shown in &apos;Intervals&apos;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="317"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="319"/>
         <source>Training</source>
         <translation type="unfinished">Тренажёр</translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="319"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="321"/>
         <source>Remote Controls</source>
         <translation></translation>
     </message>
     <message>
-        <location filename="../../Gui/HelpWhatsThis.cpp" line="321"/>
+        <location filename="../../Gui/HelpWhatsThis.cpp" line="323"/>
         <source>Train Devices</source>
         <translation>Устройства</translation>
     </message>
@@ -13042,12 +13749,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HistogramWindow</name>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="256"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="259"/>
         <source>Bin width</source>
         <translation>Ширина столбца</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="235"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="238"/>
         <source>Log Y</source>
         <translation>Логарифмический масштаб по Y</translation>
     </message>
@@ -13062,18 +13769,18 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="231"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="234"/>
         <source>Show</source>
         <translation>Показать</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="239"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="242"/>
         <source>With zeros</source>
         <translation>С нулевыми значениями</translation>
     </message>
     <message>
         <location filename="../../Charts/HistogramWindow.cpp" line="76"/>
-        <location filename="../../Charts/HistogramWindow.cpp" line="243"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="246"/>
         <source>Shade zones</source>
         <translation>Зоны на фоне</translation>
     </message>
@@ -13084,7 +13791,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     </message>
     <message>
         <location filename="../../Charts/HistogramWindow.cpp" line="77"/>
-        <location filename="../../Charts/HistogramWindow.cpp" line="247"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="250"/>
         <source>Show in zones</source>
         <translation>Разложить по зонам</translation>
     </message>
@@ -13109,32 +13816,32 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Серия данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="202"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="205"/>
         <source>Total (x-axis)</source>
         <translation>Всего (ось X)</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="206"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="209"/>
         <source>Distribution (y-axis)</source>
         <translation>Распределение (ось Y)</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="217"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="220"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="228"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="231"/>
         <source>Absolute Time</source>
         <translation>Абсолютное время</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="229"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="232"/>
         <source>Percentage Time</source>
         <translation>Процент времени</translation>
     </message>
     <message>
-        <location filename="../../Charts/HistogramWindow.cpp" line="251"/>
+        <location filename="../../Charts/HistogramWindow.cpp" line="254"/>
         <source>Use polarised zones</source>
         <translation>В полярных зонах</translation>
     </message>
@@ -13147,137 +13854,137 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="218"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="221"/>
         <source>Unable to process chart file</source>
         <translation>Невозможно обработать файл графика</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="219"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="222"/>
         <source>Bad chart type (%1).</source>
         <translation>Не правильный тип графика (%1).</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="722"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="725"/>
         <source>Are you sure you want to remove the chart?</source>
         <translation>Вы действительно хотите удалить график?</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="723"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="726"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1249"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1289"/>
         <source>Problem Saving Chart Bar Layout</source>
         <translation>Проблема с сохранением компоновки графиков</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1250"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1290"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation>Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1529"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1569"/>
         <source>Ride Log</source>
         <translation>Журнал тренировок</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1530"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1570"/>
         <source>Aerobic Power</source>
         <translation>Аэробная мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1531"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1571"/>
         <source>Anaerobic Power</source>
         <translation>Анаэробная мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1532"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1572"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1533"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1573"/>
         <source>Calendar</source>
         <translation>Календарь</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1534"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1574"/>
         <source>CP</source>
         <translation>CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1535"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1575"/>
         <source>Details</source>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1536"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1576"/>
         <source>Distance</source>
         <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1537"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1577"/>
         <source>Edit</source>
         <translation>Правка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1538"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1578"/>
         <source>Elapsed Time</source>
         <translation>Прошло времени</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1539"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1579"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1540"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1580"/>
         <source>Lap</source>
         <translation>Круг</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1541"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1581"/>
         <source>Map</source>
         <translation>Карта</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1542"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1582"/>
         <source>Performance</source>
         <translation>Результативность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1543"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1583"/>
         <source>PMC</source>
         <translation>PMC</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1544"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1584"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1545"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1585"/>
         <source>QA</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1552"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1592"/>
         <source>W&apos; In Zone</source>
         <translation>W&apos; в зоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1553"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1593"/>
         <source>Sustained In Zone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1555"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1595"/>
         <source>Navigator</source>
         <translation>Навигатор</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1566"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1606"/>
         <source>CV</source>
         <translation>CV</translation>
     </message>
@@ -13286,83 +13993,83 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="obsolete">Тренировка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1546"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1586"/>
         <source>Ride</source>
         <translation>Тренировка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1547"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1587"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1548"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1588"/>
         <source>Summary</source>
         <translation>Сводка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1549"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1589"/>
         <source>Target Power</source>
         <translation>Целевая мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1550"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1590"/>
         <source>Time and Distance</source>
         <translation>Время и дистанция</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1551"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1591"/>
         <source>Time In Zone</source>
         <translation>Время в зоне</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1554"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1594"/>
         <source>Training Mix</source>
         <translation>Тренировочный микс</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1556"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1596"/>
         <source>W/kg</source>
         <translation>Вт/кг</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1557"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1597"/>
         <source>Workout</source>
         <translation>Тренировка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1558"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1598"/>
         <source>Stress</source>
         <translation>Нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1559"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1599"/>
         <source>Scatter</source>
         <translation>Разброс</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1560"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1562"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1600"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1602"/>
         <source>HrPw</source>
         <translation>ЧСС-Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1561"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1601"/>
         <source>Activity Log</source>
         <translation>Журнал тренировок</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1563"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1603"/>
         <source>Tracker</source>
         <translation>Контроль</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1564"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1604"/>
         <source>CP History</source>
         <translation>История CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1565"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1605"/>
         <source>Library</source>
         <translation>Библиотека</translation>
     </message>
@@ -13370,12 +14077,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HrNp</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1570"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1628"/>
         <source>HrNp Ratio</source>
         <translation>Отношение ЧСС к нормализованной мощности (IsoPower)</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1575"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1633"/>
         <source>Iso Power to Average Heart Rate ratio in watts/bpm</source>
         <translation>Отношение нормализованной мощности к средней ЧСС в Вт/уд/мин</translation>
     </message>
@@ -13383,12 +14090,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HrPw</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1374"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1432"/>
         <source>HrPw Ratio</source>
         <translation>Отношение ЧСС к мощности</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1379"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1437"/>
         <source>Power to Heart Rate Ratio in watts/bpm</source>
         <translation>Отношение мощности к ЧСС в Вт/уд/мин</translation>
     </message>
@@ -13443,65 +14150,78 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HrSchemePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4471"/>
+        <location filename="../../Gui/Pages.cpp" line="5007"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4472"/>
+        <location filename="../../Gui/Pages.cpp" line="5008"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4465"/>
+        <location filename="../../Gui/Pages.cpp" line="5001"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4466"/>
+        <location filename="../../Gui/Pages.cpp" line="5002"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4481"/>
+        <location filename="../../Gui/Pages.cpp" line="5017"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4482"/>
+        <location filename="../../Gui/Pages.cpp" line="5018"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4483"/>
+        <location filename="../../Gui/Pages.cpp" line="5019"/>
         <source>Percent of LT</source>
         <translatorcomment>いまいち</translatorcomment>
         <translation>Процент от ЛП</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4484"/>
+        <location filename="../../Gui/Pages.cpp" line="5020"/>
         <source>Trimp k</source>
         <translatorcomment>でいいのかな？</translatorcomment>
         <translation>TRIMP k</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4539"/>
+        <location filename="../../Gui/Pages.cpp" line="5075"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4572"/>
-        <location filename="../../Gui/Pages.cpp" line="4579"/>
+        <location filename="../../Gui/Pages.cpp" line="5108"/>
+        <location filename="../../Gui/Pages.cpp" line="5115"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4574"/>
-        <location filename="../../Gui/Pages.cpp" line="4581"/>
+        <location filename="../../Gui/Pages.cpp" line="5110"/>
+        <location filename="../../Gui/Pages.cpp" line="5117"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
 </context>
+<context>
+    <name>HrZone</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="43"/>
+        <source>Hr Zone</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="47"/>
+        <source>Hr Zone fractional number determined from Average Hr.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>HrZonePTime1</name>
     <message>
@@ -13635,27 +14355,27 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>HrZonePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4385"/>
+        <location filename="../../Gui/Pages.cpp" line="4921"/>
         <source>Sport</source>
         <translation>Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4387"/>
+        <location filename="../../Gui/Pages.cpp" line="4923"/>
         <source>Bike</source>
         <translation>Велосипед</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4388"/>
+        <location filename="../../Gui/Pages.cpp" line="4924"/>
         <source>Run</source>
         <translation>Бег</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4429"/>
+        <location filename="../../Gui/Pages.cpp" line="4965"/>
         <source>Lactate Threshold</source>
         <translation>Лактатный порог</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4430"/>
+        <location filename="../../Gui/Pages.cpp" line="4966"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
@@ -14006,6 +14726,315 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>&lt;td align=&quot;center&quot;&gt;Время&lt;/td&gt;</translation>
     </message>
 </context>
+<context>
+    <name>HrvMeasures</name>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>HR</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>AVNN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>SDNN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>RMSSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>PNN50</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>HF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="193"/>
+        <source>Recovery Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="216"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="216"/>
+        <source>msec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="216"/>
+        <source>%</source>
+        <translation type="unfinished">%</translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="216"/>
+        <source>msec^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="216"/>
+        <source>Rec.Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.h" line="75"/>
+        <source>Hrv</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HrvMeasuresCsvImport</name>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="46"/>
+        <source>Select HRV measurements file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="46"/>
+        <source>CSV Files (*.csv)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="48"/>
+        <source>No file selected.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="53"/>
+        <source>Selected file %1 cannot be opened for reading.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="75"/>
+        <source>Column header contains duplicate identifier</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="85"/>
+        <source>Column &apos;timestamp_measurement&apos;/&apos;Datetime&apos;/&apos;date&apos; is missing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="89"/>
+        <source>Column &apos;rMSSD&apos;/&apos;rMSSD_lying&apos;/&apos;Rmssd&apos; is missing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="102"/>
+        <source>Number of data columns: %1 in line %2 lower than header columns: %3</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="129"/>
+        <source>Invalid &apos;timestamp&apos; - Date/Time not ISO 8601 format - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="142"/>
+        <source>Invalid &apos;date&apos; - Date not yyyy-dd-MM format - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="151"/>
+        <source>Invalid &apos;rMSSD&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="157"/>
+        <source>Invalid &apos;HR&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="163"/>
+        <source>Invalid &apos;AVNN&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="169"/>
+        <source>Invalid &apos;SDNN&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="175"/>
+        <source>Invalid &apos;pNN50&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="181"/>
+        <source>Invalid &apos;LF&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="187"/>
+        <source>Invalid &apos;HF&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/HrvMeasuresCsvImport.cpp" line="193"/>
+        <source>Invalid &apos;HRV4T_Recovery_Points&apos; - in line %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HrvMeasuresDownload</name>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="34"/>
+        <source>HRV Measurements download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="40"/>
+        <source>Choose the download or import source</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="41"/>
+        <source>Import CSV file</source>
+        <translation type="unfinished">Импортировать CSV файл</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="47"/>
+        <source>Choose date range for download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="48"/>
+        <source>From date of first recorded activity to today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="49"/>
+        <source>From date of last downloaded measurement to today</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="50"/>
+        <source>Enter manually:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="77"/>
+        <source>Discard all existing measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="89"/>
+        <source>Download</source>
+        <translation type="unfinished">Скачать</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="90"/>
+        <source>Close</source>
+        <translation type="unfinished">Закрыть</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="165"/>
+        <source>Body Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="165"/>
+        <source>Invalid date range - please check your input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="201"/>
+        <source>Download completed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="207"/>
+        <source>HRV Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/HrvMeasuresDownload.cpp" line="207"/>
+        <source>Downloading of HRV measurements failed with error: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>HrvPage</name>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1410"/>
+        <source>Time dependent HRV measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1413"/>
+        <source>From Date - Time</source>
+        <translation type="unfinished">Дата и время измерения</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1483"/>
+        <source>Comment</source>
+        <translation type="unfinished">Комментарий</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1522"/>
+        <location filename="../../Gui/Pages.cpp" line="1530"/>
+        <source>Update</source>
+        <translation type="unfinished">Обновить</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1524"/>
+        <source>+</source>
+        <translation type="unfinished">+</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1525"/>
+        <source>-</source>
+        <translation type="unfinished">-</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1531"/>
+        <source>Add</source>
+        <translation type="unfinished">Добавить</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1532"/>
+        <source>Delete</source>
+        <translation type="unfinished">Удалить</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1565"/>
+        <source>Source</source>
+        <translation type="unfinished">Источник</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1567"/>
+        <source>Original Source</source>
+        <translation type="unfinished">Оригинальный источник</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1586"/>
+        <location filename="../../Gui/Pages.cpp" line="1671"/>
+        <source>MMM d, yyyy - hh:mm:ss</source>
+        <translation type="unfinished">d MMM yyyy - hh:mm:ss</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/Pages.cpp" line="1714"/>
+        <source>Manual entry</source>
+        <translation type="unfinished">Ручной ввод</translation>
+    </message>
+</context>
 <context>
     <name>ICalendar</name>
     <message>
@@ -14499,53 +15528,61 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>ImagicController</name>
+    <message>
+        <location filename="../../Train/ImagicController.cpp" line="87"/>
+        <source>Cannot Connect to Imagic</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ImportChartDialog</name>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1612"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1652"/>
         <source>Import Charts</source>
         <translation>Импортировать графики</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1618"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1658"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1619"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1659"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1655"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1663"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1672"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1675"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1678"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1729"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1741"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1695"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1703"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1712"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1715"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1718"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1769"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1781"/>
         <source>Diary</source>
         <translation>Дневник</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1656"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1663"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1672"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1676"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1732"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1739"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1696"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1703"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1712"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1716"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1772"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1779"/>
         <source>Trends</source>
         <translation>Динамика показателей</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1657"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1740"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1697"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1780"/>
         <source>Activities</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Charts/HomeWindow.cpp" line="1658"/>
-        <location filename="../../Charts/HomeWindow.cpp" line="1742"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1698"/>
+        <location filename="../../Charts/HomeWindow.cpp" line="1782"/>
         <source>Train</source>
         <translation>Тренажёр</translation>
     </message>
@@ -14659,7 +15696,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>InsertXDataPointCommand</name>
     <message>
-        <location filename="../../FileIO/RideFileCommand.cpp" line="697"/>
+        <location filename="../../FileIO/RideFileCommand.cpp" line="701"/>
         <source>Insert XData Point</source>
         <translation type="unfinished"></translation>
     </message>
@@ -14689,22 +15726,22 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>IntervalMetricsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2021"/>
+        <location filename="../../Gui/Pages.cpp" line="2551"/>
         <source>Available Metrics</source>
         <translation>Доступные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2026"/>
+        <location filename="../../Gui/Pages.cpp" line="2556"/>
         <source>Selected Metrics</source>
         <translation>Выбранные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2042"/>
+        <location filename="../../Gui/Pages.cpp" line="2572"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2043"/>
+        <location filename="../../Gui/Pages.cpp" line="2573"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
@@ -14813,11 +15850,19 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Автоматически находить интервалы:</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="6257"/>
+        <location filename="../../Gui/Pages.cpp" line="6793"/>
         <source>Enable interval auto-discovery</source>
         <translation>Автоматически находить интервалы</translation>
     </message>
 </context>
+<context>
+    <name>IsoPower</name>
+    <message>
+        <location filename="../../Metrics/Coggan.cpp" line="50"/>
+        <source>Iso Power is an estimate of the power that you could have maintained for the same physiological &apos;cost&apos; if your power output had been perfectly constant.</source>
+        <translation>Нормализованная мощность (IsoPower) - это показатель того, какую мощность вам необходимо было бы прикладывать для достижения таких же физиологических затрат, если бы ваша мощность была постоянной.</translation>
+    </message>
+</context>
 <context>
     <name>JouleDevice</name>
     <message>
@@ -14858,8 +15903,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     </message>
     <message>
         <location filename="../../FileIO/JouleDevice.cpp" line="299"/>
+        <source>Version </source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Version</source>
-        <translation>Версия</translation>
+        <translation type="vanished">Версия</translation>
     </message>
     <message>
         <location filename="../../FileIO/JouleDevice.cpp" line="309"/>
@@ -14964,6 +16013,100 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>KentUniversity</name>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="319"/>
+        <source>You must authorise with KentUniversity first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="336"/>
+        <source>No such directory, try setting a new location in options.</source>
+        <translation type="unfinished">Директории не существует, укажите новое размещение в настройках.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="656"/>
+        <location filename="../../Cloud/KentUniversity.cpp" line="672"/>
+        <source>Completed.</source>
+        <translation type="unfinished">Завершено.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="660"/>
+        <source>Upload failed</source>
+        <translation type="unfinished">Загрузка на сервис не удалась</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.h" line="49"/>
+        <source>University of Kent</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.h" line="50"/>
+        <source>Participate in academic studies sharing data via google drive.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>KentUniversityUploadDialog</name>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="827"/>
+        <source>Upload to Kent University</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="838"/>
+        <source>Session Perceived Exertion (sRPE)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="854"/>
+        <source>Post Session Fatigue (ROF)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="869"/>
+        <source>Notes</source>
+        <translation type="unfinished">Заметки</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="877"/>
+        <source>Missed workouts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="882"/>
+        <source>Is a self administered test workout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="885"/>
+        <source>Uploading %1 bytes...</source>
+        <translation type="unfinished">Загружается %1 байт...</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="895"/>
+        <source>Upload</source>
+        <translation type="unfinished">Закачать</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="942"/>
+        <location filename="../../Cloud/KentUniversity.cpp" line="970"/>
+        <source>Upload Failed</source>
+        <translation type="unfinished">Загрузка не удалась</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="943"/>
+        <location filename="../../Cloud/KentUniversity.cpp" line="971"/>
+        <source>Unable to upload, check your configuration in preferences.</source>
+        <translation type="unfinished">Невозможно загрузить, проверте настройки.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="1010"/>
+        <source>Done</source>
+        <translation type="unfinished">Закрыть</translation>
+    </message>
+</context>
 <context>
     <name>KettlerController</name>
     <message>
@@ -14975,68 +16118,68 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>KeywordsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2872"/>
+        <location filename="../../Gui/Pages.cpp" line="3408"/>
         <source>Field</source>
         <translation>Поле</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2879"/>
+        <location filename="../../Gui/Pages.cpp" line="3415"/>
         <source>Use for Background</source>
         <translation>Использовать для фона</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2895"/>
+        <location filename="../../Gui/Pages.cpp" line="3431"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2897"/>
+        <location filename="../../Gui/Pages.cpp" line="3433"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2898"/>
+        <location filename="../../Gui/Pages.cpp" line="3434"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2910"/>
+        <location filename="../../Gui/Pages.cpp" line="3446"/>
         <source>Keyword</source>
         <translation>Ключевое слово</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2911"/>
+        <location filename="../../Gui/Pages.cpp" line="3447"/>
         <source>Color</source>
         <translation>Цвет</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2912"/>
+        <location filename="../../Gui/Pages.cpp" line="3448"/>
         <source>Related Notes Words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3041"/>
-        <location filename="../../Gui/Pages.cpp" line="3047"/>
+        <location filename="../../Gui/Pages.cpp" line="3577"/>
+        <location filename="../../Gui/Pages.cpp" line="3583"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3049"/>
+        <location filename="../../Gui/Pages.cpp" line="3585"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2883"/>
+        <location filename="../../Gui/Pages.cpp" line="3419"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2884"/>
+        <location filename="../../Gui/Pages.cpp" line="3420"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2896"/>
+        <location filename="../../Gui/Pages.cpp" line="3432"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -15262,142 +16405,142 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>LTMPlot</name>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="106"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="267"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="1508"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="109"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="270"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1515"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="269"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="1490"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="272"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1497"/>
         <source>Time of Day</source>
         <translation>Время дня</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="644"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="682"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="724"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="1889"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="651"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="689"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="731"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1896"/>
         <source>%1 trend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="804"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="811"/>
         <source>%1 average</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="861"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="868"/>
         <source>%1 Top %2 Outliers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="865"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="872"/>
         <source>%1 Outlier</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="953"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="960"/>
         <source>%1 Best</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="956"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="963"/>
         <source>Best %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1330"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1337"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1341"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2467"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1348"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2474"/>
         <source>Best</source>
         <translation type="unfinished">Лучшие</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1493"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1500"/>
         <source>Day</source>
         <translation>День</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1496"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1503"/>
         <source>Week</source>
         <translation>Неделя</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1499"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1506"/>
         <source>Month</source>
         <translation>Месяц</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1502"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1509"/>
         <source>Year</source>
         <translation>Год</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1505"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="3613"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1512"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3758"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1812"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="1848"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1819"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1855"/>
         <source>%1 %2 trend</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1982"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1989"/>
         <source>%1 %2 Outliers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="2070"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2077"/>
         <source>%1 %2 Best</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="3920"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="4067"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="3966"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="4113"/>
         <source>minutes</source>
         <translation type="unfinished">минут</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="1016"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="1183"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2128"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2295"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2546"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2677"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2823"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="3479"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="3649"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1023"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="1190"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2135"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2302"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2553"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2687"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2833"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3624"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3794"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="2560"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2712"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="2980"/>
-        <location filename="../../Charts/LTMPlot.cpp" line="3434"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2567"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2722"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="2991"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3497"/>
         <source>Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="3479"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3624"/>
         <source>hours</source>
         <translation type="unfinished">часы</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.cpp" line="3617"/>
+        <location filename="../../Charts/LTMPlot.cpp" line="3762"/>
         <source>Week Commencing %1</source>
         <translation>Неделя, начинающаяся с %1</translation>
     </message>
@@ -15504,271 +16647,266 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>LTMSidebar</name>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="71"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="80"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="74"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="83"/>
         <source>Date Ranges</source>
         <translation>Диапазон времени</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="101"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="109"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="143"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="104"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="114"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="148"/>
         <source>Events</source>
         <translation>События</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="501"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="517"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="544"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="591"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="600"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="620"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="478"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="494"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="521"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="568"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="577"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="597"/>
         <source>Add season</source>
         <translation>Добавить сезон</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="542"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="618"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="519"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="595"/>
         <source>Edit season</source>
         <translation>Изменить сезон</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="543"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="619"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="520"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="596"/>
         <source>Delete season</source>
         <translation>Удалить сезон</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="659"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="701"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="636"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="684"/>
         <source>Edit details</source>
         <translation>Изменить данные</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="72"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="102"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="136"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="171"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="75"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="105"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="141"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="176"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="133"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="138"/>
         <source>Charts</source>
         <translation>Графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="170"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="178"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="175"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="183"/>
         <source>Filters</source>
         <translation>Фильтры</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="209"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="214"/>
         <source>Autofilter</source>
         <translation>Автофильтр</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="218"/>
         <source>Summary</source>
-        <translation>Сводка</translation>
+        <translation type="vanished">Сводка</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="515"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="598"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="492"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="575"/>
         <source>Edit phase</source>
         <translation>Изменить фазу</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="516"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="599"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="493"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="576"/>
         <source>Delete phase</source>
         <translation>Удалить фазу</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="518"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="545"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="601"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="621"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1277"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1284"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="495"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="522"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="578"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="598"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1260"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1273"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1288"/>
         <source>Add Event</source>
         <translation>Добавить событие</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="519"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="546"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="602"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="622"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1372"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1379"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="496"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="523"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="579"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="599"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1417"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1430"/>
         <source>Add Phase</source>
         <translation>Добавить фазу</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="660"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="702"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="637"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="685"/>
         <source>Delete event</source>
         <translation>Удалить событие</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="670"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="695"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="647"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="678"/>
         <source>Add event</source>
         <translation>Добавить событие</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="728"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="711"/>
         <source>Workout Code|Sport</source>
         <translation>Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="809"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="967"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1020"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="792"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="950"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1003"/>
         <source>(blank)</source>
         <translation>(пусто)</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1070"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1053"/>
         <source>Manage Filters</source>
         <translation>Управление фильтрами</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1076"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1059"/>
         <source>Delete Filter%1</source>
         <translation>Удалить фильтр %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1186"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1169"/>
         <source>Edit Season</source>
         <translation>Изменить сезон</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1186"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1169"/>
         <source>You can only edit user defined seasons. Please select a season you have created for editing.</source>
         <translation>Вы можете редактировать только сезоны, которые создавали сами. Выберите сезон, что бы отредактировать его.</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1264"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1247"/>
         <source>Delete Season</source>
         <translation>Удалить сезон</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1264"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1247"/>
         <source>You can only delete user defined seasons. Please select a season you have created for deletion.</source>
         <translation>Вы можете удалять только созданные вами же сезоны. Выберите для удаления созданный вами сезон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1277"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1284"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1260"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1273"/>
         <source>You can only add events to user defined seasons. Please select a season you have created before adding an event.</source>
         <translation>Вы можете добавлять события только в созданные вами же сезоны. Сначала выберите созданный вами сезон, затем добавьте в него событие.</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1372"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1379"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1288"/>
+        <source>The new event could not be uploaded to your remote calendar.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1417"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1430"/>
         <source>You can only add phases to user defined seasons. Please select a season you have created before adding a phase.</source>
         <translation>Вы можете добавлять фазы только в созданные вами же сезоны. Сначала выберите созданный вами сезон, затем добавьте в него фазу.</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1467"/>
         <source>Totals</source>
-        <translation>Всего</translation>
+        <translation type="vanished">Всего</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1472"/>
         <source>Averages</source>
-        <translation>В среднем</translation>
+        <translation type="vanished">В среднем</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1477"/>
         <source>Maximums</source>
-        <translation>Максимум</translation>
+        <translation type="vanished">Максимум</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1482"/>
         <source>Metrics</source>
-        <translation>Показатели</translation>
+        <translation type="vanished">Показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1503"/>
-        <source>^(Average|Max) </source>
-        <translation></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1507"/>
         <source>seconds</source>
-        <translation>секунд</translation>
+        <translation type="vanished">секунд</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1556"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1469"/>
         <source>Add Chart</source>
         <translation>Добавить график</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1563"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1476"/>
         <source>Edit Chart</source>
         <translation>Изменить график</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1564"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1477"/>
         <source>Delete Chart</source>
         <translation>Удалить график</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1573"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1486"/>
         <source>Delete Selected Charts</source>
         <translation>Удалить выбранные графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1581"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1494"/>
         <source>Export Chart</source>
         <translation>Экспортировать график</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1583"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1496"/>
         <source>Export Selected Charts</source>
         <translation>Экспортировать выбранные графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1595"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1508"/>
         <source>Import Charts</source>
         <translation>Импортировать графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1602"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1515"/>
         <source>Reset to default</source>
         <translation>Вернуть исходные параметры</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1695"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1608"/>
         <source>Export Charts</source>
         <translation>Экспортировать графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1695"/>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1715"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1608"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1628"/>
         <source>Chart File (*.xml)</source>
         <translation>Файл графика (*.xml)</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1746"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1659"/>
         <source>Entry Error</source>
         <translation>Ошибка ввода</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1746"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1659"/>
         <source>Selected file (%1) does not exist</source>
         <translation>Выбранный файл (%1) не существует</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1757"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1670"/>
         <source>You are about to reset the chart sidebar to the default setup</source>
         <translation>Параметры боковой панели будут сброшены до исходных</translation>
     </message>
     <message>
-        <location filename="../../Gui/LTMSidebar.cpp" line="1758"/>
+        <location filename="../../Gui/LTMSidebar.cpp" line="1671"/>
         <source>Do you want to continue?</source>
         <translation>Вы хотите продолжить?</translation>
     </message>
@@ -15776,7 +16914,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>LTMTool</name>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1299"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1304"/>
         <source>Metric</source>
         <translation>Показатель</translation>
     </message>
@@ -15845,343 +16983,343 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Показывать события</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="347"/>
+        <location filename="../../Charts/LTMTool.cpp" line="352"/>
         <source>Skiba Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="349"/>
-        <location filename="../../Charts/LTMTool.cpp" line="364"/>
-        <location filename="../../Charts/LTMTool.cpp" line="425"/>
-        <location filename="../../Charts/LTMTool.cpp" line="440"/>
-        <location filename="../../Charts/LTMTool.cpp" line="501"/>
-        <location filename="../../Charts/LTMTool.cpp" line="516"/>
-        <location filename="../../Charts/LTMTool.cpp" line="576"/>
-        <location filename="../../Charts/LTMTool.cpp" line="591"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1076"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1091"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1152"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1167"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1305"/>
+        <location filename="../../Charts/LTMTool.cpp" line="354"/>
+        <location filename="../../Charts/LTMTool.cpp" line="369"/>
+        <location filename="../../Charts/LTMTool.cpp" line="430"/>
+        <location filename="../../Charts/LTMTool.cpp" line="445"/>
+        <location filename="../../Charts/LTMTool.cpp" line="506"/>
+        <location filename="../../Charts/LTMTool.cpp" line="521"/>
+        <location filename="../../Charts/LTMTool.cpp" line="581"/>
+        <location filename="../../Charts/LTMTool.cpp" line="596"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1081"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1096"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1157"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1172"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1310"/>
         <source>Stress</source>
         <translation>Нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="362"/>
+        <location filename="../../Charts/LTMTool.cpp" line="367"/>
         <source>Skiba Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="377"/>
+        <location filename="../../Charts/LTMTool.cpp" line="382"/>
         <source>Skiba Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="379"/>
-        <location filename="../../Charts/LTMTool.cpp" line="455"/>
-        <location filename="../../Charts/LTMTool.cpp" line="531"/>
-        <location filename="../../Charts/LTMTool.cpp" line="606"/>
-        <location filename="../../Charts/LTMTool.cpp" line="682"/>
-        <location filename="../../Charts/LTMTool.cpp" line="758"/>
-        <location filename="../../Charts/LTMTool.cpp" line="834"/>
-        <location filename="../../Charts/LTMTool.cpp" line="910"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1106"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1182"/>
+        <location filename="../../Charts/LTMTool.cpp" line="384"/>
+        <location filename="../../Charts/LTMTool.cpp" line="460"/>
+        <location filename="../../Charts/LTMTool.cpp" line="536"/>
+        <location filename="../../Charts/LTMTool.cpp" line="611"/>
+        <location filename="../../Charts/LTMTool.cpp" line="687"/>
+        <location filename="../../Charts/LTMTool.cpp" line="763"/>
+        <location filename="../../Charts/LTMTool.cpp" line="839"/>
+        <location filename="../../Charts/LTMTool.cpp" line="915"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1111"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1187"/>
         <source>Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="392"/>
+        <location filename="../../Charts/LTMTool.cpp" line="397"/>
         <source>Skiba STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="394"/>
-        <location filename="../../Charts/LTMTool.cpp" line="409"/>
-        <location filename="../../Charts/LTMTool.cpp" line="470"/>
-        <location filename="../../Charts/LTMTool.cpp" line="485"/>
-        <location filename="../../Charts/LTMTool.cpp" line="546"/>
-        <location filename="../../Charts/LTMTool.cpp" line="561"/>
-        <location filename="../../Charts/LTMTool.cpp" line="621"/>
-        <location filename="../../Charts/LTMTool.cpp" line="636"/>
-        <location filename="../../Charts/LTMTool.cpp" line="697"/>
-        <location filename="../../Charts/LTMTool.cpp" line="712"/>
-        <location filename="../../Charts/LTMTool.cpp" line="773"/>
-        <location filename="../../Charts/LTMTool.cpp" line="788"/>
-        <location filename="../../Charts/LTMTool.cpp" line="849"/>
-        <location filename="../../Charts/LTMTool.cpp" line="864"/>
-        <location filename="../../Charts/LTMTool.cpp" line="925"/>
-        <location filename="../../Charts/LTMTool.cpp" line="940"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1001"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1016"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1121"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1136"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1197"/>
-        <location filename="../../Charts/LTMTool.cpp" line="1212"/>
+        <location filename="../../Charts/LTMTool.cpp" line="399"/>
+        <location filename="../../Charts/LTMTool.cpp" line="414"/>
+        <location filename="../../Charts/LTMTool.cpp" line="475"/>
+        <location filename="../../Charts/LTMTool.cpp" line="490"/>
+        <location filename="../../Charts/LTMTool.cpp" line="551"/>
+        <location filename="../../Charts/LTMTool.cpp" line="566"/>
+        <location filename="../../Charts/LTMTool.cpp" line="626"/>
+        <location filename="../../Charts/LTMTool.cpp" line="641"/>
+        <location filename="../../Charts/LTMTool.cpp" line="702"/>
+        <location filename="../../Charts/LTMTool.cpp" line="717"/>
+        <location filename="../../Charts/LTMTool.cpp" line="778"/>
+        <location filename="../../Charts/LTMTool.cpp" line="793"/>
+        <location filename="../../Charts/LTMTool.cpp" line="854"/>
+        <location filename="../../Charts/LTMTool.cpp" line="869"/>
+        <location filename="../../Charts/LTMTool.cpp" line="930"/>
+        <location filename="../../Charts/LTMTool.cpp" line="945"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1006"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1021"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1126"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1141"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1202"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1217"/>
         <source>Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="407"/>
+        <location filename="../../Charts/LTMTool.cpp" line="412"/>
         <source>Skiba LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="423"/>
+        <location filename="../../Charts/LTMTool.cpp" line="428"/>
         <source>Aerobic TISS Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="438"/>
+        <location filename="../../Charts/LTMTool.cpp" line="443"/>
         <source>Aerobic TISS Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="453"/>
+        <location filename="../../Charts/LTMTool.cpp" line="458"/>
         <source>Aerobic TISS Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="468"/>
+        <location filename="../../Charts/LTMTool.cpp" line="473"/>
         <source>Aerobic TISS STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="483"/>
+        <location filename="../../Charts/LTMTool.cpp" line="488"/>
         <source>Aerobic TISS LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="499"/>
+        <location filename="../../Charts/LTMTool.cpp" line="504"/>
         <source>Anaerobic TISS Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="514"/>
+        <location filename="../../Charts/LTMTool.cpp" line="519"/>
         <source>Anaerobic TISS Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="529"/>
+        <location filename="../../Charts/LTMTool.cpp" line="534"/>
         <source>Anaerobic TISS Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="544"/>
+        <location filename="../../Charts/LTMTool.cpp" line="549"/>
         <source>Anaerobic TISS STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="559"/>
+        <location filename="../../Charts/LTMTool.cpp" line="564"/>
         <source>Anaerobic TISS LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="574"/>
+        <location filename="../../Charts/LTMTool.cpp" line="579"/>
         <source>Daniels Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="589"/>
+        <location filename="../../Charts/LTMTool.cpp" line="594"/>
         <source>Daniels Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="604"/>
+        <location filename="../../Charts/LTMTool.cpp" line="609"/>
         <source>Daniels Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="619"/>
+        <location filename="../../Charts/LTMTool.cpp" line="624"/>
         <source>Daniels STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="634"/>
+        <location filename="../../Charts/LTMTool.cpp" line="639"/>
         <source>Daniels LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="650"/>
+        <location filename="../../Charts/LTMTool.cpp" line="655"/>
         <source>Work (Kj) Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="652"/>
-        <location filename="../../Charts/LTMTool.cpp" line="667"/>
-        <location filename="../../Charts/LTMTool.cpp" line="728"/>
-        <location filename="../../Charts/LTMTool.cpp" line="743"/>
-        <location filename="../../Charts/LTMTool.cpp" line="804"/>
-        <location filename="../../Charts/LTMTool.cpp" line="819"/>
+        <location filename="../../Charts/LTMTool.cpp" line="657"/>
+        <location filename="../../Charts/LTMTool.cpp" line="672"/>
+        <location filename="../../Charts/LTMTool.cpp" line="733"/>
+        <location filename="../../Charts/LTMTool.cpp" line="748"/>
+        <location filename="../../Charts/LTMTool.cpp" line="809"/>
+        <location filename="../../Charts/LTMTool.cpp" line="824"/>
         <source>Stress (Kj)</source>
         <translation>Нагрузка (кДж)</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="665"/>
+        <location filename="../../Charts/LTMTool.cpp" line="670"/>
         <source>Work (Kj) Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="680"/>
+        <location filename="../../Charts/LTMTool.cpp" line="685"/>
         <source>Work (Kj) Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="695"/>
+        <location filename="../../Charts/LTMTool.cpp" line="700"/>
         <source>Work (Kj) STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="710"/>
+        <location filename="../../Charts/LTMTool.cpp" line="715"/>
         <source>Work (Kj) LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="726"/>
+        <location filename="../../Charts/LTMTool.cpp" line="731"/>
         <source>W&apos; Work (Kj) Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="741"/>
+        <location filename="../../Charts/LTMTool.cpp" line="746"/>
         <source>W&apos; Work (Kj) Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="756"/>
+        <location filename="../../Charts/LTMTool.cpp" line="761"/>
         <source>W&apos; Work (Kj) Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="771"/>
+        <location filename="../../Charts/LTMTool.cpp" line="776"/>
         <source>W&apos; Work (Kj) STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="786"/>
+        <location filename="../../Charts/LTMTool.cpp" line="791"/>
         <source>W&apos; Work (Kj) LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="802"/>
+        <location filename="../../Charts/LTMTool.cpp" line="807"/>
         <source>Below CP Work (Kj) Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="817"/>
+        <location filename="../../Charts/LTMTool.cpp" line="822"/>
         <source>Below CP Work (Kj) Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="832"/>
+        <location filename="../../Charts/LTMTool.cpp" line="837"/>
         <source>Below CP Work (Kj) Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="847"/>
+        <location filename="../../Charts/LTMTool.cpp" line="852"/>
         <source>Below CP Work (Kj) STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="862"/>
+        <location filename="../../Charts/LTMTool.cpp" line="867"/>
         <source>Below CP Work (Kj) LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="878"/>
+        <location filename="../../Charts/LTMTool.cpp" line="883"/>
         <source>Distance (km|mi) Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="880"/>
-        <location filename="../../Charts/LTMTool.cpp" line="895"/>
+        <location filename="../../Charts/LTMTool.cpp" line="885"/>
+        <location filename="../../Charts/LTMTool.cpp" line="900"/>
         <source>Stress (km|mi)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="893"/>
+        <location filename="../../Charts/LTMTool.cpp" line="898"/>
         <source>Distance (km|mi) Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="908"/>
+        <location filename="../../Charts/LTMTool.cpp" line="913"/>
         <source>Distance (km|mi) Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="923"/>
+        <location filename="../../Charts/LTMTool.cpp" line="928"/>
         <source>Distance (km|mi) STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="938"/>
+        <location filename="../../Charts/LTMTool.cpp" line="943"/>
         <source>Distance (km|mi) LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="954"/>
+        <location filename="../../Charts/LTMTool.cpp" line="959"/>
         <source>Coggan Chronic Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="969"/>
+        <location filename="../../Charts/LTMTool.cpp" line="974"/>
         <source>Coggan Acute Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="984"/>
+        <location filename="../../Charts/LTMTool.cpp" line="989"/>
         <source>Coggan Training Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="999"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1004"/>
         <source>Coggan STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1014"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1019"/>
         <source>Coggan LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1029"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1034"/>
         <source>Coggan Expected Chronic Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1044"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1049"/>
         <source>Coggan Expected Acute Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1059"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1064"/>
         <source>Coggan Expected Training Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1075"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1080"/>
         <source>TRIMP Long Term Stress</source>
         <translatorcomment>Уровень тренированности (база)</translatorcomment>
         <translation>TRIMP долговременный стресс</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1089"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1094"/>
         <source>TRIMP Short Term Stress</source>
         <translatorcomment>Уровень усталости</translatorcomment>
         <translation>TRIMP кратковременный стресс</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1104"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1109"/>
         <source>TRIMP Stress Balance</source>
         <translatorcomment>Уровень формы</translatorcomment>
         <translation>TRIMP баланс стресса</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1119"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1124"/>
         <source>TRIMP STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1134"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1139"/>
         <source>TRIMP LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
@@ -16194,7 +17332,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="obsolete">Ошибка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="264"/>
+        <location filename="../../Charts/LTMTool.cpp" line="269"/>
         <source>Edit</source>
         <translation>Изменить</translation>
     </message>
@@ -16204,27 +17342,32 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Использовать параметры из графика в боковой панели</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="309"/>
+        <location filename="../../Charts/LTMTool.cpp" line="314"/>
         <source>Basic</source>
         <translation>Основные параметры</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="310"/>
+        <location filename="../../Charts/LTMTool.cpp" line="315"/>
         <source>Preset</source>
         <translation>Предустановка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1303"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1308"/>
         <source>Estimate</source>
         <translation>Оценка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1307"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1312"/>
         <source>Formula</source>
         <translation>Формула</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1483"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1314"/>
+        <source>Measure</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/LTMTool.cpp" line="1490"/>
         <source>Chart %1</source>
         <translation>График %1</translation>
     </message>
@@ -16287,57 +17430,57 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="283"/>
+        <location filename="../../Charts/LTMTool.cpp" line="288"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="284"/>
+        <location filename="../../Charts/LTMTool.cpp" line="289"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="311"/>
+        <location filename="../../Charts/LTMTool.cpp" line="316"/>
         <source>Curves</source>
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1150"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1155"/>
         <source>TriScore Long Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1165"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1170"/>
         <source>TriScore Short Term Stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1180"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1185"/>
         <source>TriScore Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1195"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1200"/>
         <source>TriScore STS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1210"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1215"/>
         <source>TriScore LTS Ramp</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1288"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1293"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1288"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1293"/>
         <source>Details</source>
         <translation>Подробности</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMTool.cpp" line="1301"/>
+        <location filename="../../Charts/LTMTool.cpp" line="1306"/>
         <source>Peak</source>
         <translation>Пик</translation>
     </message>
@@ -16345,43 +17488,43 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>LTMWindow</name>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="206"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="210"/>
         <source>Days</source>
         <translation>Дни</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="207"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="211"/>
         <source>Weeks</source>
         <translation>Недели</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="208"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="212"/>
         <source>Months</source>
         <translation>Месяцы</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="209"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="213"/>
         <source>Years</source>
         <translation>Годы</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="211"/>
-        <location filename="../../Charts/LTMWindow.cpp" line="1111"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="215"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1105"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="216"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="220"/>
         <source>Data Table</source>
         <translation>Таблица вместо графиков</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="217"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="221"/>
         <source>Stacked</source>
         <translation>Раздельно</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="229"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="233"/>
         <source>Export Chart Data...</source>
         <translation>Экспортировать данные графика...</translation>
     </message>
@@ -16390,84 +17533,84 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Экспортировать параметры графика...</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1092"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1086"/>
         <source> grouped by </source>
         <translation> с группировкой по </translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1096"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1090"/>
         <source>day</source>
         <translation>дням</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1099"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1093"/>
         <source>week</source>
         <translation>неделям</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1102"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1096"/>
         <source>month</source>
         <translation>месяцам</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1105"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1099"/>
         <source>year</source>
         <translation>годам</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1108"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1102"/>
         <source>time of day</source>
         <translation>времени дня</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1290"/>
-        <location filename="../../Charts/LTMWindow.cpp" line="1340"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1287"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1337"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1191"/>
-        <location filename="../../Charts/LTMWindow.cpp" line="1193"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1188"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1190"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1266"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1263"/>
         <source>Coggan Acute Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1267"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1264"/>
         <source>Coggan Chronic Training Load</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1268"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1265"/>
         <source>Coggan Training Stress Balance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1290"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1287"/>
         <source>hours</source>
         <translation>часов</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1384"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1381"/>
         <source>Export Chart Config</source>
         <translation>Экспортировать параметры графика</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="1397"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="1394"/>
         <source>Save Chart Data as CSV</source>
         <translation>Сохранить данные графика в CSV</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="202"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="206"/>
         <source>Group by</source>
         <translation>Группировка</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMWindow.cpp" line="210"/>
+        <location filename="../../Charts/LTMWindow.cpp" line="214"/>
         <source>Time Of Day</source>
         <translation>Время дня</translation>
     </message>
@@ -16475,105 +17618,105 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>LTPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4646"/>
-        <location filename="../../Gui/Pages.cpp" line="4655"/>
+        <location filename="../../Gui/Pages.cpp" line="5182"/>
+        <location filename="../../Gui/Pages.cpp" line="5191"/>
         <source>Update</source>
         <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4648"/>
-        <location filename="../../Gui/Pages.cpp" line="4662"/>
+        <location filename="../../Gui/Pages.cpp" line="5184"/>
+        <location filename="../../Gui/Pages.cpp" line="5198"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4649"/>
-        <location filename="../../Gui/Pages.cpp" line="4663"/>
+        <location filename="../../Gui/Pages.cpp" line="5185"/>
+        <location filename="../../Gui/Pages.cpp" line="5199"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4656"/>
-        <location filename="../../Gui/Pages.cpp" line="4668"/>
+        <location filename="../../Gui/Pages.cpp" line="5192"/>
+        <location filename="../../Gui/Pages.cpp" line="5204"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4657"/>
-        <location filename="../../Gui/Pages.cpp" line="4669"/>
+        <location filename="../../Gui/Pages.cpp" line="5193"/>
+        <location filename="../../Gui/Pages.cpp" line="5205"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4659"/>
+        <location filename="../../Gui/Pages.cpp" line="5195"/>
         <source>Def</source>
         <translation type="unfinished">По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4687"/>
-        <location filename="../../Gui/Pages.cpp" line="4728"/>
+        <location filename="../../Gui/Pages.cpp" line="5223"/>
+        <location filename="../../Gui/Pages.cpp" line="5264"/>
         <source>From Date</source>
         <translation>Дата замера</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4688"/>
-        <location filename="../../Gui/Pages.cpp" line="4729"/>
+        <location filename="../../Gui/Pages.cpp" line="5224"/>
+        <location filename="../../Gui/Pages.cpp" line="5265"/>
         <source>Lactate Threshold</source>
         <translation>Лактатный порог</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4997"/>
+        <location filename="../../Gui/Pages.cpp" line="5533"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5032"/>
-        <location filename="../../Gui/Pages.cpp" line="5039"/>
+        <location filename="../../Gui/Pages.cpp" line="5568"/>
+        <location filename="../../Gui/Pages.cpp" line="5575"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5034"/>
-        <location filename="../../Gui/Pages.cpp" line="5041"/>
+        <location filename="../../Gui/Pages.cpp" line="5570"/>
+        <location filename="../../Gui/Pages.cpp" line="5577"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4706"/>
-        <location filename="../../Gui/Pages.cpp" line="4730"/>
+        <location filename="../../Gui/Pages.cpp" line="5242"/>
+        <location filename="../../Gui/Pages.cpp" line="5266"/>
         <source>Rest HR</source>
         <translation>ЧСС в покое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4707"/>
-        <location filename="../../Gui/Pages.cpp" line="4731"/>
+        <location filename="../../Gui/Pages.cpp" line="5243"/>
+        <location filename="../../Gui/Pages.cpp" line="5267"/>
         <source>Max HR</source>
         <translation>Максимальная ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4751"/>
-        <location filename="../../Gui/Pages.cpp" line="4821"/>
-        <location filename="../../Gui/Pages.cpp" line="4842"/>
+        <location filename="../../Gui/Pages.cpp" line="5287"/>
+        <location filename="../../Gui/Pages.cpp" line="5357"/>
+        <location filename="../../Gui/Pages.cpp" line="5378"/>
         <source>MMM d, yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4768"/>
+        <location filename="../../Gui/Pages.cpp" line="5304"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4769"/>
+        <location filename="../../Gui/Pages.cpp" line="5305"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4770"/>
+        <location filename="../../Gui/Pages.cpp" line="5306"/>
         <source>From BPM</source>
         <translation>От уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="4771"/>
+        <location filename="../../Gui/Pages.cpp" line="5307"/>
         <source>Trimp k</source>
         <translation>Тренировочный импульс (TRIMP)</translation>
     </message>
@@ -16634,161 +17777,156 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
 <context>
     <name>Leaf</name>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1030"/>
+        <location filename="../../Core/DataFilter.cpp" line="1057"/>
         <source>%1 is unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1053"/>
+        <location filename="../../Core/DataFilter.cpp" line="1080"/>
         <source>Array subscript needs a symbol name.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1065"/>
+        <location filename="../../Core/DataFilter.cpp" line="1092"/>
         <source>Index must be numeric.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1085"/>
+        <location filename="../../Core/DataFilter.cpp" line="1112"/>
         <source>invalid data series for best(): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1090"/>
+        <location filename="../../Core/DataFilter.cpp" line="1117"/>
         <source>invalid data series for tiz(): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1097"/>
+        <location filename="../../Core/DataFilter.cpp" line="1124"/>
         <source>invalid literal for daterange(): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1111"/>
+        <location filename="../../Core/DataFilter.cpp" line="1138"/>
         <source>invalid literal for config(): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1117"/>
+        <location filename="../../Core/DataFilter.cpp" line="1144"/>
         <source>invalid literal for const(): %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1144"/>
+        <location filename="../../Core/DataFilter.cpp" line="1171"/>
         <source>which function has at least 2 parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1156"/>
+        <location filename="../../Core/DataFilter.cpp" line="1183"/>
         <source>XDATA needs 3 parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1163"/>
+        <location filename="../../Core/DataFilter.cpp" line="1190"/>
         <source>XDATA expects a string for first two parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1170"/>
+        <location filename="../../Core/DataFilter.cpp" line="1197"/>
         <source>XDATA expects a symbol, one of sparse, repeat, interpolate or resample for third parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1177"/>
+        <location filename="../../Core/DataFilter.cpp" line="1204"/>
         <source>XDATA expects one of sparse, repeat, interpolate or resample for third parameter. (%1)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1200"/>
+        <location filename="../../Core/DataFilter.cpp" line="1227"/>
         <source>XDATA_UNITS needs 2 parameters.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1207"/>
+        <location filename="../../Core/DataFilter.cpp" line="1234"/>
         <source>XDATA_UNITS expects a string for first two parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1222"/>
+        <location filename="../../Core/DataFilter.cpp" line="1249"/>
         <source>isset/set/unset function first parameter is field/metric to set.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1235"/>
+        <location filename="../../Core/DataFilter.cpp" line="1262"/>
         <source>%1 is not supported in isset/set/unset operations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1245"/>
+        <location filename="../../Core/DataFilter.cpp" line="1272"/>
         <source>isset has one parameter, a symbol to check.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1252"/>
+        <location filename="../../Core/DataFilter.cpp" line="1279"/>
         <source>set function needs 3 paramaters; symbol, value and expression.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1253"/>
+        <location filename="../../Core/DataFilter.cpp" line="1280"/>
         <source>unset function needs 2 paramaters; symbol and expression.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1271"/>
+        <location filename="../../Core/DataFilter.cpp" line="1298"/>
         <source>estimate function expects model name as first parameter.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1277"/>
+        <location filename="../../Core/DataFilter.cpp" line="1304"/>
         <source>estimate function expects model name as first parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1288"/>
+        <location filename="../../Core/DataFilter.cpp" line="1315"/>
         <source>estimate function expects parameter or duration as second parameter</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1308"/>
+        <location filename="../../Core/DataFilter.cpp" line="1335"/>
         <source>function &apos;%1&apos; expects %2 parameter(s) not %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1320"/>
+        <location filename="../../Core/DataFilter.cpp" line="1347"/>
         <source>unknown function %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1330"/>
+        <location filename="../../Core/DataFilter.cpp" line="1357"/>
         <source>unary negation on a string!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1350"/>
-        <location filename="../../Core/DataFilter.cpp" line="1367"/>
+        <location filename="../../Core/DataFilter.cpp" line="1377"/>
+        <location filename="../../Core/DataFilter.cpp" line="1394"/>
         <source>variables must be numeric.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1376"/>
+        <location filename="../../Core/DataFilter.cpp" line="1403"/>
         <source>assignment must be to a symbol.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1389"/>
+        <location filename="../../Core/DataFilter.cpp" line="1416"/>
         <source>comparing strings with numbers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/DataFilter.cpp" line="1396"/>
+        <location filename="../../Core/DataFilter.cpp" line="1423"/>
         <source>using a string operations with a number</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../Core/DataFilter.cpp" line="1425"/>
-        <source>internal parser error: parms</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>LeftRightBalance</name>
@@ -16842,7 +17980,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     </message>
     <message>
         <location filename="../../Train/Library.cpp" line="208"/>
-        <source>%1 already exists in workout library: %2</source>
+        <source>%1 cannot be written to workout library %2, check permissions and free space</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -16948,7 +18086,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     <name>LocalFileStore</name>
     <message>
         <location filename="../../Cloud/LocalFileStore.cpp" line="50"/>
-        <location filename="../../Cloud/LocalFileStore.cpp" line="164"/>
+        <location filename="../../Cloud/LocalFileStore.cpp" line="163"/>
         <source>You must define a network folder first</source>
         <translation>Сначала необходимо указать сетевую папку</translation>
     </message>
@@ -16963,14 +18101,14 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation>Папка %1 не существует</translation>
     </message>
     <message>
-        <location filename="../../Cloud/LocalFileStore.cpp" line="151"/>
-        <location filename="../../Cloud/LocalFileStore.cpp" line="185"/>
+        <location filename="../../Cloud/LocalFileStore.cpp" line="150"/>
+        <location filename="../../Cloud/LocalFileStore.cpp" line="183"/>
         <source>Completed.</source>
         <translation>Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/LocalFileStore.cpp" line="171"/>
-        <location filename="../../Cloud/LocalFileStore.cpp" line="181"/>
+        <location filename="../../Cloud/LocalFileStore.cpp" line="170"/>
+        <location filename="../../Cloud/LocalFileStore.cpp" line="179"/>
         <source>Write to folder %1 failed</source>
         <translation>Не удалось записать в папку %1</translation>
     </message>
@@ -16979,12 +18117,12 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
         <translation type="vanished">Локальное хранилище </translation>
     </message>
     <message>
-        <location filename="../../Cloud/LocalFileStore.h" line="35"/>
+        <location filename="../../Cloud/LocalFileStore.h" line="36"/>
         <source>Local Store</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/LocalFileStore.h" line="36"/>
+        <location filename="../../Cloud/LocalFileStore.h" line="37"/>
         <source>Sync with a local folder or thumbdrive.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -17077,7 +18215,7 @@ Torque Adjust - this defines an absolute value in poinds per square inch or newt
     <message>
         <location filename="../../FileIO/MacroDevice.cpp" line="156"/>
         <source>Failed to create temporary file </source>
-        <translation type="unfinished">Не удалось создать временный файл</translation>
+        <translation type="unfinished">Не удалось создать временный файл </translation>
     </message>
     <message>
         <location filename="../../FileIO/MacroDevice.cpp" line="188"/>
@@ -17142,8 +18280,8 @@ on and that its display says, &quot;PC Link&quot;</source>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1775"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1817"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1785"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1827"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
@@ -17163,17 +18301,17 @@ on and that its display says, &quot;PC Link&quot;</source>
         <translation>&amp;Загрузить с устройства...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="548"/>
+        <location filename="../../Gui/MainWindow.cpp" line="553"/>
         <source>Diary</source>
         <translation>Дневник</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="546"/>
+        <location filename="../../Gui/MainWindow.cpp" line="551"/>
         <source>Train</source>
         <translation>Тренажёр</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="551"/>
+        <location filename="../../Gui/MainWindow.cpp" line="556"/>
         <source>Add Chart</source>
         <translation>Добавить график</translation>
     </message>
@@ -17195,14 +18333,14 @@ on and that its display says, &quot;PC Link&quot;</source>
         <translation type="vanished">Разделить тренировку...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1504"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1514"/>
         <source>Delete Activity</source>
         <translation>Удалить тренировку</translation>
     </message>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="282"/>
         <source>Tiled View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вид плиткой</translation>
     </message>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="378"/>
@@ -17298,123 +18436,125 @@ on and that its display says, &quot;PC Link&quot;</source>
         <translation type="vanished">Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="453"/>
+        <location filename="../../Gui/MainWindow.cpp" line="461"/>
         <source>CP and W&apos; Solver...</source>
         <translation>Калькулятор CP и W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="455"/>
+        <location filename="../../Gui/MainWindow.cpp" line="463"/>
         <source>VDOT and T-Pace Calculator...</source>
         <translation>Калькулятор VDOT и T-Pace...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="466"/>
+        <location filename="../../Gui/MainWindow.cpp" line="471"/>
         <source>Import workouts, videos, videoSyncs...</source>
         <translation>Импортировать тренировки, видеоролики...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="467"/>
+        <location filename="../../Gui/MainWindow.cpp" line="472"/>
         <source>Scan disk for workouts, videos, videoSyncs...</source>
         <translation type="unfinished">Найти видеоролики и занятия на диске...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="478"/>
+        <location filename="../../Gui/MainWindow.cpp" line="483"/>
         <source>Maintain charts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Управление графиками в облаке</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="482"/>
+        <location filename="../../Gui/MainWindow.cpp" line="487"/>
         <source>Curate charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="936"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1650"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1667"/>
+        <location filename="../../Gui/MainWindow.cpp" line="946"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1660"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1677"/>
         <source>Activity Import</source>
         <translation>Импорт тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="936"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1650"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1667"/>
+        <location filename="../../Gui/MainWindow.cpp" line="946"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1660"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1677"/>
         <source>Closing of athlete window not possible while background activity import is in progress...</source>
         <translation>Невозможно закрыть аккаунт спортсмена, пока не будет завершён импорт...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1244"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1254"/>
         <source>Chart Import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Импорт графика</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1391"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1401"/>
         <source>Failed to export activity, please check permissions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не удалось экспортировать тренировку, пожалуйста проверьте разрешения</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1427"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1437"/>
         <source>No Activity To Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Нет тренировки для сохранения</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1428"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1438"/>
         <source>There is no currently selected activity to save.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Не выбрана тренировка для сохранения.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1480"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1482"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1490"/>
         <location filename="../../Gui/MainWindow.cpp" line="1492"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1494"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1502"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1504"/>
         <source>Split Activity</source>
         <translation>Разделить тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1480"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1492"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1490"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1502"/>
         <source>No activity selected</source>
         <translation>Тренировка не выбрана</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1482"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1492"/>
         <source>Current activity contains no data to split</source>
         <translation>Данная тренировка не содержит данных, которые можно разделить</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1494"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1504"/>
         <source>Current activity contains no data to merge</source>
         <translation>Данная тренировка не содержит данных, которые можно объеденить</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1510"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1520"/>
         <source>Are you sure you want to delete the activity:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы уверены, что хотите удалить эту тренировку:</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1984"/>
-        <location filename="../../Gui/MainWindow.cpp" line="2006"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1994"/>
+        <location filename="../../Gui/MainWindow.cpp" line="2016"/>
         <source>The workout directory is not configured, or the directory selected no longer exists.
 
 Please check your preference settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Директория для тренировки не указана в конфигурации или выбранная диреткория не доступна.
+
+Пожалуйста, проверьте настройки.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="2195"/>
+        <location filename="../../Gui/MainWindow.cpp" line="2233"/>
         <source>CloudDB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">CloudDB</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="2195"/>
+        <location filename="../../Gui/MainWindow.cpp" line="2233"/>
         <source>Current athlete is not registered as curator - please contact the GoldenCheetah team</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Текущий спортсмен не зарегистрирован как куратор, свяжитесь в GoldenCheetah team</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="469"/>
+        <location filename="../../Gui/MainWindow.cpp" line="474"/>
         <source>Create Heat Map...</source>
         <translation>Создать тепловую карту...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="470"/>
+        <location filename="../../Gui/MainWindow.cpp" line="475"/>
         <source>Export Metrics as CSV...</source>
         <translation>Экспортировать показатели в CSV...</translation>
     </message>
@@ -17427,12 +18567,12 @@ Please check your preference settings.</source>
         <translation type="vanished">Ctrl+U</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="461"/>
+        <location filename="../../Gui/MainWindow.cpp" line="466"/>
         <source>Create a new workout...</source>
         <translation>Создать тренировку...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="462"/>
+        <location filename="../../Gui/MainWindow.cpp" line="467"/>
         <source>Download workouts from ErgDB...</source>
         <translation>Скачать тренировки из ErgDB...</translation>
     </message>
@@ -17445,7 +18585,7 @@ Please check your preference settings.</source>
         <translation type="vanished">Найти видеоролики и занятия на диске...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="454"/>
+        <location filename="../../Gui/MainWindow.cpp" line="462"/>
         <source>Air Density (Rho) Estimator...</source>
         <translation>Оценить плотность воздуха...</translation>
     </message>
@@ -17503,7 +18643,7 @@ Please check your preference settings.</source>
         <translation>Объединить тренировки...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="452"/>
+        <location filename="../../Gui/MainWindow.cpp" line="460"/>
         <source>CP and W&apos; Estimator...</source>
         <translation>Оценить CP и W&apos;...</translation>
     </message>
@@ -17516,28 +18656,28 @@ Please check your preference settings.</source>
         <translation type="vanished">Загрузить тренировку в календарь</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="544"/>
+        <location filename="../../Gui/MainWindow.cpp" line="549"/>
         <source>Activities</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="558"/>
+        <location filename="../../Gui/MainWindow.cpp" line="563"/>
         <source>Tabbed not Tiled</source>
         <translation>Вкладки вместо мозаики</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1038"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1048"/>
         <source>You are about to reset all charts to the default setup</source>
         <translation>Вы вернёте все графики в исходное состояние.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1039"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1049"/>
         <source>Do you want to continue?</source>
         <translation>Продолжить?</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1775"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1817"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1785"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1827"/>
         <source>&amp;New Athlete...</source>
         <translation>&amp;Добавить спортсмена...</translation>
     </message>
@@ -17551,23 +18691,23 @@ Please check your preference settings.</source>
         <translation>Найти интервалы...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1324"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1334"/>
         <source>Select Activity</source>
         <translation>Выбрать тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1324"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1504"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1334"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1514"/>
         <source>No activity selected!</source>
         <translation>Тренировка не выбрана!</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1337"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1347"/>
         <source>Export Activity</source>
         <translation>Экспортировать тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1390"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1400"/>
         <source>Export Failed</source>
         <translation>Не удалось выполнить экспорт</translation>
     </message>
@@ -17599,53 +18739,83 @@ Please check your preference settings.</source>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="431"/>
         <source>Add Cloud Account...</source>
-        <translation type="unfinished"></translation>
+        <translation>Добавить облачный аккаунт...</translation>
     </message>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="432"/>
         <source>Ctrl+A</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+A</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="451"/>
+        <location filename="../../Gui/MainWindow.cpp" line="437"/>
+        <source>Upload Activity...</source>
+        <translation>Закачать тренировку...</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="438"/>
+        <source>Synchronise Activities...</source>
+        <translation>Синхронизировать тренировки...</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="439"/>
+        <source>Get &amp;Body Measurements...</source>
+        <translation type="unfinished">Получить измерения (&amp;Body)...</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="440"/>
+        <source>Get &amp;HRV Measurements...</source>
+        <translation type="unfinished">Получить измерения (&amp;HRV)...</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="442"/>
+        <source>Check For New Activities</source>
+        <translation>Проверить новые тренировки</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="443"/>
+        <source>Ctrl-C</source>
+        <translation>Ctrl-C</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MainWindow.cpp" line="459"/>
         <source>&amp;Tools</source>
         <translation>&amp;Инструменты</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="490"/>
+        <location filename="../../Gui/MainWindow.cpp" line="495"/>
         <source>&amp;Options...</source>
         <translation>&amp;Параметры ...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="523"/>
+        <location filename="../../Gui/MainWindow.cpp" line="528"/>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="525"/>
-        <location filename="../../Gui/MainWindow.cpp" line="527"/>
+        <location filename="../../Gui/MainWindow.cpp" line="530"/>
+        <location filename="../../Gui/MainWindow.cpp" line="532"/>
         <source>Toggle Full Screen</source>
         <translation>Переключить полноэкранный режим</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="529"/>
+        <location filename="../../Gui/MainWindow.cpp" line="534"/>
         <source>Show Left Sidebar</source>
         <translation>Показывать левую боковую панель</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="532"/>
+        <location filename="../../Gui/MainWindow.cpp" line="537"/>
         <source>Show Compare Pane</source>
         <translation>Показывать панель сравнения</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="535"/>
+        <location filename="../../Gui/MainWindow.cpp" line="540"/>
         <source>Show Toolbar</source>
         <translation>Показывать панель инструментов</translation>
     </message>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="281"/>
         <source>Tabbed View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вид вкладками</translation>
     </message>
     <message>
         <location filename="../../Gui/MainWindow.cpp" line="398"/>
@@ -17669,129 +18839,124 @@ Please check your preference settings.</source>
         <translation type="vanished">Синхронизировать с Sixcycle...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="458"/>
-        <source>Get &amp;Body Measures...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/MainWindow.cpp" line="464"/>
+        <location filename="../../Gui/MainWindow.cpp" line="469"/>
         <source>Download workouts from Today&apos;s Plan...</source>
         <translation type="unfinished">Скачать тренировки из Today&apos;s Plan...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="475"/>
+        <location filename="../../Gui/MainWindow.cpp" line="480"/>
         <source>Cloud Status...</source>
         <translation type="unfinished">Статус облачного хранилища...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="477"/>
+        <location filename="../../Gui/MainWindow.cpp" line="482"/>
         <source>Cloud Contributions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Облачное хранилище графиков</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="481"/>
+        <location filename="../../Gui/MainWindow.cpp" line="486"/>
         <source>Cloud Curator</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="497"/>
+        <location filename="../../Gui/MainWindow.cpp" line="502"/>
         <source>&amp;Edit</source>
         <translation>&amp;Правка</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="538"/>
+        <location filename="../../Gui/MainWindow.cpp" line="543"/>
         <source>Show Athlete Tabs</source>
         <translation>Показывать панель спортсменов</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="545"/>
+        <location filename="../../Gui/MainWindow.cpp" line="550"/>
         <source>Trends</source>
         <translation>Динамика показателей</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="553"/>
+        <location filename="../../Gui/MainWindow.cpp" line="558"/>
         <source>Upload Chart...</source>
         <translation type="unfinished">Загрузить график...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="554"/>
+        <location filename="../../Gui/MainWindow.cpp" line="559"/>
         <source>Download Chart...</source>
         <translation type="unfinished">Скачать график...</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="557"/>
+        <location filename="../../Gui/MainWindow.cpp" line="562"/>
         <source>Reset Layout</source>
         <translation>Вернуть исходные графики</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="570"/>
+        <location filename="../../Gui/MainWindow.cpp" line="575"/>
         <source>&amp;Help</source>
         <translation>&amp;Помощь</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="571"/>
+        <location filename="../../Gui/MainWindow.cpp" line="576"/>
         <source>&amp;Help Overview</source>
         <translation>Обзор &amp;справки</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="573"/>
+        <location filename="../../Gui/MainWindow.cpp" line="578"/>
         <source>&amp;User Guide</source>
         <translation>&amp;Руководство пользователя</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="574"/>
+        <location filename="../../Gui/MainWindow.cpp" line="579"/>
         <source>&amp;Log a bug or feature request</source>
         <translation>&amp;Трекер ошибок и запросов</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="575"/>
+        <location filename="../../Gui/MainWindow.cpp" line="580"/>
         <source>&amp;Discussion and Support Forum</source>
         <translation>&amp;Форум и техподдержка</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="577"/>
+        <location filename="../../Gui/MainWindow.cpp" line="582"/>
         <source>&amp;About GoldenCheetah</source>
         <translation>&amp;О GoldenCheetah</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1244"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1254"/>
         <source>Imported %1 metric charts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1412"/>
-        <location filename="../../Gui/MainWindow.cpp" line="1953"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1422"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1963"/>
         <source>Import from File</source>
         <translation>Импорт из файла</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1926"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1936"/>
         <source>Refresh in Progress</source>
         <translation>Выполняется обновление</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1932"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1942"/>
         <source>Export Metrics</source>
         <translation>Экспортировать показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1932"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1942"/>
         <source>Comma Separated Variables (*.csv)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1983"/>
-        <location filename="../../Gui/MainWindow.cpp" line="2005"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1993"/>
+        <location filename="../../Gui/MainWindow.cpp" line="2015"/>
         <source>Workout Directory Invalid</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Директория для тренировок не правильная</translation>
     </message>
     <message>
-        <location filename="../../Gui/MainWindow.cpp" line="1512"/>
+        <location filename="../../Gui/MainWindow.cpp" line="1522"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="177"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="178"/>
         <source>Changes on </source>
         <translation>Изменения в </translation>
     </message>
@@ -17970,8 +19135,8 @@ Please check your preference settings.</source>
 <context>
     <name>MapWebBridge</name>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="1317"/>
-        <location filename="../../Charts/RideMapWindow.cpp" line="1370"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="1355"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="1411"/>
         <source>Selection #%1 </source>
         <translation type="unfinished">Выделение #%1 </translation>
     </message>
@@ -17992,18 +19157,18 @@ Please check your preference settings.</source>
 <context>
     <name>MaxCT</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2088"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2146"/>
         <source>Max Core Temperature</source>
         <translation>Макс. температура тела</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2089"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2090"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2147"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2148"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2092"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2150"/>
         <source>Maximum Core Temperature. The core body temperature estimate is based on HR data</source>
         <translation>Максимальная температуратела. Определяется на основе данных ЧСС.</translation>
     </message>
@@ -18011,18 +19176,18 @@ Please check your preference settings.</source>
 <context>
     <name>MaxCadence</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2190"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2248"/>
         <source>Max Cadence</source>
         <translation>Макс. каденс</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2191"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2192"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2249"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2250"/>
         <source>rpm</source>
         <translation>об/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2194"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2252"/>
         <source>Maximum Cadence</source>
         <translation type="unfinished">Максимальный каденс</translation>
     </message>
@@ -18030,18 +19195,18 @@ Please check your preference settings.</source>
 <context>
     <name>MaxHr</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1985"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2043"/>
         <source>Max Heartrate</source>
         <translation>Макс. ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1986"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1987"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2044"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2045"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1989"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2047"/>
         <source>Maximum Heart Rate.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18068,18 +19233,18 @@ Please check your preference settings.</source>
 <context>
     <name>MaxPower</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1744"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1802"/>
         <source>Max Power</source>
         <translation>Макс. мощность</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1745"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1746"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1803"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1804"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1748"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1806"/>
         <source>Maximum Power</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18087,12 +19252,12 @@ Please check your preference settings.</source>
 <context>
     <name>MaxPowerVariance</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2611"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2669"/>
         <source>Max Power Variance</source>
         <translation>Колебание макс. мощности</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2616"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2674"/>
         <source>Maximum Power Deviation with respect to 30sec Moving Average</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18119,41 +19284,41 @@ Please check your preference settings.</source>
 <context>
     <name>MaxSmO2</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1790"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1848"/>
         <source>Max SmO2</source>
         <translation>SmO₂ макс</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1791"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1792"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1849"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1850"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1794"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1852"/>
         <source>Maximum Muscle Oxygen Saturation, the percentage of hemoglobin that is carrying oxygen.</source>
-        <translation>Максимальное нашыщение мышц кислородом, процент насыщения гемоглобина, участвующего в переносе кислорода.</translation>
+        <translation>Максимальное насыщение мышц кислородом, процент насыщения гемоглобина, участвующего в переносе кислорода.</translation>
     </message>
 </context>
 <context>
     <name>MaxSpeed</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2137"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2195"/>
         <source>Max Speed</source>
         <translation>Макс. скорость</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2138"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2196"/>
         <source>kph</source>
         <translation>км/ч</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2139"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2197"/>
         <source>mph</source>
         <translation>миль/ч</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2143"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2201"/>
         <source>Maximum Speed</source>
         <translation>Максимальная скорость</translation>
     </message>
@@ -18161,22 +19326,22 @@ Please check your preference settings.</source>
 <context>
     <name>MaxTemp</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2240"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2298"/>
         <source>Max Temp</source>
         <translation>Макс. температура</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2241"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2299"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2242"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2300"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2247"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2305"/>
         <source>Maximum Temperature</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18207,18 +19372,18 @@ Please check your preference settings.</source>
 <context>
     <name>MaxtHb</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1836"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1894"/>
         <source>Max tHb</source>
         <translation>Макс. tHb</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1837"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1838"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1895"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1896"/>
         <source>g/dL</source>
         <translation>г/дл</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1841"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1899"/>
         <source>Maximum total hemoglobin concentration. The total grams of hemoglobin per deciliter.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18226,16 +19391,44 @@ Please check your preference settings.</source>
 <context>
     <name>MeanPowerVariance</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2541"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2599"/>
         <source>Average Power Variance</source>
         <translation>Колебания средней мощности</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2546"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2604"/>
         <source>Mean Power Deviation with respect to 30sec Moving Average</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Measure</name>
+    <message>
+        <location filename="../../Core/Measures.cpp" line="41"/>
+        <source>Manual entry</source>
+        <translation type="unfinished">Ручной ввод</translation>
+    </message>
+    <message>
+        <location filename="../../Core/Measures.cpp" line="43"/>
+        <source>Nokia Health (Withings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Measures.cpp" line="45"/>
+        <source>Today&apos;s Plan</source>
+        <translation type="unfinished">Today&apos;s Plan</translation>
+    </message>
+    <message>
+        <location filename="../../Core/Measures.cpp" line="47"/>
+        <source>CSV Upload</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Measures.cpp" line="49"/>
+        <source>Unknown</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>MergeActivityWizard</name>
     <message>
@@ -18247,22 +19440,22 @@ Please check your preference settings.</source>
 <context>
     <name>MergeAdjust</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="892"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="933"/>
         <source>Adjust Alignment</source>
         <translation>Настройка совмещения</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="893"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="934"/>
         <source>Adjust merge alignment in time</source>
         <translation>Настроить выравнивание объединения по времени</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="938"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="979"/>
         <source>Adjust:</source>
         <translation>Смещение:</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="941"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="982"/>
         <source>Reset</source>
         <translation>Сбросить</translation>
     </message>
@@ -18270,32 +19463,32 @@ Please check your preference settings.</source>
 <context>
     <name>MergeChoose</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="654"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="696"/>
         <source>Choose an Activity</source>
         <translation>Выберите тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="655"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="697"/>
         <source>Choose an Existing activity to Combine</source>
         <translation>Выберите существующую тренировку для добавления</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="663"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="705"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="664"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="706"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="665"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="707"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="683"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="722"/>
         <source>dd MMM yyyy</source>
         <translation>dd MMM yyyy</translation>
     </message>
@@ -18303,17 +19496,17 @@ Please check your preference settings.</source>
 <context>
     <name>MergeConfirm</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="1175"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1226"/>
         <source>Confirm</source>
         <translation>Подтвердить</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="1176"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1227"/>
         <source>Complete and Save</source>
         <translation>Завершить и сохранить</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="1181"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1232"/>
         <source>Press Finish to update the current activity with  the combined data.
 
 The changes will be saved and cannot be undone.
@@ -18329,17 +19522,17 @@ If you press continue the activity will be saved, if you do not want to continue
 <context>
     <name>MergeDownload</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="573"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="615"/>
         <source>Download Activity</source>
         <translation>Скачать тренировку</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="574"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="616"/>
         <source>Download Activity to Combine</source>
         <translation>Скачать тренировку для объединения</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="627"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="669"/>
         <source>Error - Unknown file type</source>
         <translation>Ошибка - неизвестный тип файла</translation>
     </message>
@@ -18347,32 +19540,32 @@ If you press continue the activity will be saved, if you do not want to continue
 <context>
     <name>MergeMode</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="735"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="776"/>
         <source>Select Mode</source>
         <translation>Выберите режим</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="736"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="777"/>
         <source>How would you like to combine the data ?</source>
         <translation>Как вы хотите объединить данные?</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="745"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="786"/>
         <source>Merge Data to add another data series</source>
         <translation>Внести данные другого вида</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="746"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="787"/>
         <source>Merge data series from one recording into the current activity where different types of data (e.g. O2 data from a Moxy) have been  recorded by different devices. Taking care to align the data in time.</source>
         <translation>Объединить серии данных из одной тренировки с текущей тренировкой, если использовались различные типы данных (например данные по O2 из Moxy), записанные на различные устройства. Будьте внимательны с вырвниванием времени.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="754"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="795"/>
         <source>Join Data to form a longer activity</source>
         <translation>Дописать новые данные в конец текущих</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="755"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="796"/>
         <source>Append the data to the end of the current activity  to create a longer activity that was recorded in multiple parts.</source>
         <translation>Добавить данные в конец текущей тренировки, что бы создать длинную тренировку записанную в несколько приёмов.</translation>
     </message>
@@ -18380,75 +19573,91 @@ If you press continue the activity will be saved, if you do not want to continue
 <context>
     <name>MergeSelect</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="1044"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1085"/>
         <source>Merge Data Series</source>
         <translation>Объединить серии данных</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="1045"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1086"/>
         <source>Select the series to merge together</source>
         <translation>Выберите объединяемые серии</translation>
     </message>
+    <message>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1094"/>
+        <source>Target activity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1095"/>
+        <source>Source of additional data series</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1149"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="1152"/>
+        <source>d MMM yy hh:mm:ss</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MergeSource</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="427"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="469"/>
         <source>Select Source</source>
         <translation>Выберите источник</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="428"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="470"/>
         <source>Where is the data you want to combine ?</source>
         <translation>Где находяться данные для объединения?</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="437"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="479"/>
         <source>Import from a File</source>
         <translation>Импортировать из файла</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="438"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="480"/>
         <source>Import and combine from a file on your hard disk or device mounted as a USB disk to combine with the current activity.</source>
         <translation>Импортировать данные из файла на диске или устройстве подключенном как USB диск и объединить с текущей тренировкой.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="447"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="489"/>
         <source>Download from Device</source>
         <translation>Скачать с устройства</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="448"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="490"/>
         <source>Download data from a serial port device such as a Moxy Muscle Oxygen Monitor or bike computer to combine with the current activity.</source>
         <translation>Загрузить данные с устройства, например по последовательному порту с Moxy Oxygen Monitor или велокомпьютера и объеденить с текущей тренировкой.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="456"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="498"/>
         <source>Existing Activity</source>
         <translation>Существующая тренировка</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="457"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="499"/>
         <source>Combine data from an activity that has already been imported or downloaded into GoldenCheetah. Selecting from a list of all available activities. </source>
         <translation>Объеденить данные с уже существующей тренировкой в GoldenCheetah. Выбрать из списка доступных тренировок.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="516"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="558"/>
         <source>All Supported Formats (%1)</source>
         <translation>Все поддерживаемые форматы (%1)</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="519"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="561"/>
         <source>All files (*.*)</source>
         <translation>Все файлы (*.txt)</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="521"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="563"/>
         <source>Import from File</source>
         <translation>Импорт из файла</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="563"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="605"/>
         <source>Error - Unknown file type</source>
         <translation>Ошибка - неизвестный тип файла</translation>
     </message>
@@ -18456,52 +19665,52 @@ If you press continue the activity will be saved, if you do not want to continue
 <context>
     <name>MergeStrategy</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="797"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="838"/>
         <source>Select Strategy</source>
         <translation>Выбрать стратегию</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="798"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="839"/>
         <source>How should we align the data ?</source>
         <translation>Как объединить данные?</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="807"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="848"/>
         <source>Align using start time</source>
         <translation>По времени начала</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="808"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="849"/>
         <source>Align the data from the two activities based upon the start time for the activities. This will work well if the devices used to record the data have their clocks synchronised / close to each other.</source>
         <translation>Совместить данные двух тренировок по времени начала. Это будет хорошо работать, если часы в использованных устройствах для записи очень точно синхронизированы друг относительно друга.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="816"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="857"/>
         <source>Align using shared data series</source>
         <translation>По совпадающим сериям данных</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="817"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="858"/>
         <source>If the two activities both contain the same data series, for example where both devices recorded cadence or perhaps HR, then we can align the other data series in time by matching the peaks and troughs in the shared data.</source>
         <translation>Если две тренировки имеют совпадающие серии данных, например если обе тренировки содержать записи каденса или ЧСС, тогда они могут быть выровнены по времени совпадения пиков и минимумов общих серий данных.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="825"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="866"/>
         <source>Align starting together</source>
         <translation>Чтобы начались одновременно</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="826"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="867"/>
         <source>Regardless of the timestamp on the activity, align with both activities starting at the same time.</source>
         <translation>Независимо от записанных в тренировках данных по времени, совместить их так, что бы они начались одновременно.</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="833"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="874"/>
         <source>Align ending together</source>
         <translation>Чтобы закончились одновременно</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="834"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="875"/>
         <source>Regardless of the timestamp on the activity, align with both activities ending at the same time.</source>
         <translation>Независимо от записанных в тренировках данных по времени, совместить их так, что бы они закончились одновременно.</translation>
     </message>
@@ -18509,17 +19718,17 @@ If you press continue the activity will be saved, if you do not want to continue
 <context>
     <name>MergeWelcome</name>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="407"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="449"/>
         <source>Combine Activities</source>
         <translation>Объединить тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="408"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="450"/>
         <source>Lets get started</source>
         <translation>Приступим</translation>
     </message>
     <message>
-        <location filename="../../Gui/MergeActivityWizard.cpp" line="413"/>
+        <location filename="../../Gui/MergeActivityWizard.cpp" line="455"/>
         <source>This wizard will help you combine data with the currently selected activity.
 
 You will be able to import or download data before merging or joining the data and manually adjusting the alignment of data series before it is saved.</source>
@@ -18531,22 +19740,22 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MetadataPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2801"/>
+        <location filename="../../Gui/Pages.cpp" line="3337"/>
         <source>Fields</source>
         <translation>Поля</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2802"/>
+        <location filename="../../Gui/Pages.cpp" line="3338"/>
         <source>Notes Keywords</source>
         <translation>Ключевые слова заметок</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2803"/>
+        <location filename="../../Gui/Pages.cpp" line="3339"/>
         <source>Defaults</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2804"/>
+        <location filename="../../Gui/Pages.cpp" line="3340"/>
         <source>Processing</source>
         <translation>Обработка</translation>
     </message>
@@ -18554,22 +19763,22 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MetricConfig</name>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="419"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="430"/>
         <source>Custom</source>
         <translation type="unfinished">На заказ</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="420"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="431"/>
         <source>Bests</source>
         <translation>Лучшие результаты</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="421"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="432"/>
         <source>Summary</source>
         <translation>Сводка</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="422"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="433"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
@@ -18577,18 +19786,18 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MinHr</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2033"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2091"/>
         <source>Min Heartrate</source>
         <translation>Мин. ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2034"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2035"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2092"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2093"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2037"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2095"/>
         <source>Minimum Heart Rate.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18596,18 +19805,18 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MinSmO2</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1885"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1943"/>
         <source>Min SmO2</source>
         <translation>SmO₂ мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1886"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1887"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1944"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1945"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1889"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1947"/>
         <source>Minimum Muscle Oxygen Saturation, the percentage of hemoglobin that is carrying oxygen.</source>
         <translation>Минимальное нашыщение мышц кислородом, процент насыщения гемоглобина, участвующего в переносе кислорода.</translation>
     </message>
@@ -18615,22 +19824,22 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MinTemp</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2296"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2354"/>
         <source>Min Temp</source>
         <translation>Мин. Темп.</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2297"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2355"/>
         <source>C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2298"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2356"/>
         <source>F</source>
         <translation>°F</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2303"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2361"/>
         <source>Minimum Temperature</source>
         <translation>Максимальная температура</translation>
     </message>
@@ -18657,18 +19866,18 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>MintHb</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1935"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1993"/>
         <source>Min tHb</source>
         <translation>Мин. tHb</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1936"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1937"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1994"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1995"/>
         <source>g/dL</source>
         <translation>г/дл</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1940"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1998"/>
         <source>Minimum total hemoglobin concentration. The total grams of hemoglobin per deciliter.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -18676,473 +19885,371 @@ You will be able to import or download data before merging or joining the data a
 <context>
     <name>ModelDataProvider</name>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="266"/>
         <source>Power (watts)</source>
-        <translation>Мощность (Вт)</translation>
+        <translation type="vanished">Мощность (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="267"/>
         <source>Cadence (rpm)</source>
-        <translation>Каденс (об/мин)</translation>
+        <translation type="vanished">Каденс (об/мин)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="268"/>
         <source>Heartrate (bpm)</source>
-        <translation>ЧСС (уд/мин)</translation>
+        <translation type="vanished">ЧСС (уд/мин)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="271"/>
         <source>Speed (kph)</source>
-        <translation>Скорость (км/ч)</translation>
+        <translation type="vanished">Скорость (км/ч)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="273"/>
         <source>Speed (mph)</source>
-        <translation>Скорость (миль/ч)</translation>
+        <translation type="vanished">Скорость (миль/ч)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="277"/>
         <source>Altitude (meters)</source>
-        <translation>Высота (метры)</translation>
+        <translation type="vanished">Высота (метры)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="279"/>
         <source>Altitude (feet)</source>
-        <translation>Высота (футы)</translation>
+        <translation type="vanished">Высота (футы)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="281"/>
         <source>Torque (N)</source>
-        <translation>Крутящий момент (Н)</translation>
+        <translation type="vanished">Крутящий момент (Н)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="282"/>
         <source>Elapsed Time (secs)</source>
-        <translation>Прошло времени (с)</translation>
+        <translation type="vanished">Прошло времени (с)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="285"/>
         <source>Elapsed Distance (km)</source>
-        <translation>Пройденная дистанция (км)</translation>
+        <translation type="vanished">Пройденная дистанция (км)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="287"/>
         <source>Elapsed Distance (mi)</source>
-        <translation>Пройденная дистанция (миль)</translation>
+        <translation type="vanished">Пройденная дистанция (миль)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="289"/>
         <source>Interval Number</source>
-        <translation>Номер интервала</translation>
+        <translation type="vanished">Номер интервала</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="290"/>
         <source>Latitude (degree x 1000)</source>
-        <translation>Широта (градус × 1000)</translation>
+        <translation type="vanished">Широта (градус × 1000)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="291"/>
         <source>Longitude (degree x 1000)</source>
-        <translation>Долгота (градус × 1000)</translation>
+        <translation type="vanished">Долгота (градус × 1000)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="292"/>
         <source>Circumferential Pedal Velocity (cm/s)</source>
-        <translation>Периферическая скорость педалирования (см/с)</translation>
+        <translation type="vanished">Периферическая скорость педалирования (см/с)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="293"/>
         <source>Average Effective Pedal Force (N)</source>
-        <translation>Средняя эффективная сила педалирования (Н)</translation>
+        <translation type="vanished">Средняя эффективная сила педалирования (Н)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="297"/>
         <source>Time at X/Y (%)</source>
-        <translation>Время в X/Y (%)</translation>
+        <translation type="vanished">Время в X/Y (%)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="298"/>
         <source>Power Zone</source>
-        <translation>Зона мощности</translation>
+        <translation type="vanished">Зона мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="299"/>
         <source>L/R Balance</source>
-        <translation>Баланс Л/П</translation>
+        <translation type="vanished">Баланс Л/П</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="300"/>
         <source>Running Vertical Oscillation</source>
-        <translation>Вертикальное колебание (бег)</translation>
+        <translation type="vanished">Вертикальное колебание (бег)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="301"/>
         <source>Running Ground Contact Time</source>
-        <translation>Время контакта с землёй при беге</translation>
+        <translation type="vanished">Время контакта с землёй при беге</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="302"/>
         <source>Running Cadence</source>
-        <translation>Каденс бега</translation>
+        <translation type="vanished">Каденс бега</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="303"/>
         <source>Gear Ratio</source>
-        <translation>Передаточное отношение</translation>
+        <translation type="vanished">Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="304"/>
         <source>Muscle Oxygen</source>
-        <translation>Кислород в мышцах</translation>
+        <translation type="vanished">Кислород в мышцах</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="305"/>
         <source>Haemoglobin Mass</source>
-        <translation>Масса гемоглобина</translation>
+        <translation type="vanished">Масса гемоглобина</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="306"/>
         <source>Slope (gradient)</source>
-        <translation>Наклон (градиент)</translation>
+        <translation type="vanished">Наклон (градиент)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="308"/>
         <source>Unknown</source>
-        <translation>Неизвеcтно</translation>
+        <translation type="vanished">Неизвеcтно</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="312"/>
         <source>Power</source>
-        <translation>Мощность</translation>
+        <translation type="vanished">Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="313"/>
         <source>Cadence</source>
-        <translation>Каденс</translation>
+        <translation type="vanished">Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="314"/>
         <source>Heartrate</source>
-        <translation>ЧСС</translation>
+        <translation type="vanished">ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="315"/>
         <source>Speed</source>
-        <translation>Скорость</translation>
+        <translation type="vanished">Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="316"/>
         <source>Altitude</source>
-        <translation>Высота</translation>
+        <translation type="vanished">Высота</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="317"/>
         <source>Pedal Force</source>
-        <translation>Сила педалирования</translation>
+        <translation type="vanished">Сила педалирования</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="318"/>
         <source>Time</source>
-        <translation>Время</translation>
+        <translation type="vanished">Время</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="319"/>
         <source>Distance</source>
-        <translation>Дистанция</translation>
+        <translation type="vanished">Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="320"/>
         <source>Interval</source>
-        <translation>Интервал</translation>
+        <translation type="vanished">Интервал</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="321"/>
         <source>Latitude</source>
-        <translation>Широта</translation>
+        <translation type="vanished">Широта</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="322"/>
         <source>Longitude</source>
-        <translation>Долгота</translation>
+        <translation type="vanished">Долгота</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="323"/>
         <source>Time at X/Y</source>
-        <translation>Время в X/Y</translation>
+        <translation type="vanished">Время в X/Y</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="324"/>
         <source>Zone</source>
-        <translation>Зона</translation>
+        <translation type="vanished">Зона</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="325"/>
         <source>CPV</source>
-        <translation>CPV</translation>
+        <translation type="vanished">CPV</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="326"/>
         <source>AEPF</source>
-        <translation>AEPF</translation>
+        <translation type="vanished">AEPF</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="327"/>
         <source>Balance</source>
-        <translation>Баланс</translation>
+        <translation type="vanished">Баланс</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="328"/>
         <source>RV</source>
-        <translation>RV</translation>
+        <translation type="vanished">RV</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="329"/>
         <source>GCT</source>
-        <translation>GCT</translation>
+        <translation type="vanished">GCT</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="330"/>
         <source>Run Cad</source>
-        <translation>Кад. бега</translation>
+        <translation type="vanished">Кад. бега</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="331"/>
         <source>Gear</source>
-        <translation>Передача</translation>
+        <translation type="vanished">Передача</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="332"/>
         <source>SmO2</source>
-        <translation>SmO₂</translation>
+        <translation type="vanished">SmO₂</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="333"/>
         <source>tHb</source>
-        <translation>tHb</translation>
+        <translation type="vanished">tHb</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="334"/>
         <source>Slope</source>
-        <translation>Наклон</translation>
+        <translation type="vanished">Наклон</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="336"/>
         <source>None</source>
-        <translation>Нет</translation>
+        <translation type="vanished">Нет</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelPlot.cpp" line="505"/>
         <source>No data or bin size too large</source>
-        <translation>Нет данных или ширина столбца слишком большая</translation>
+        <translation type="vanished">Нет данных или ширина столбца слишком большая</translation>
     </message>
 </context>
 <context>
     <name>ModelWindow</name>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="36"/>
         <source>Power</source>
-        <translation>Мощность</translation>
+        <translation type="vanished">Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="37"/>
         <source>Cadence</source>
-        <translation>Каденс</translation>
+        <translation type="vanished">Каденс</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="38"/>
         <source>Heartrate</source>
-        <translation>ЧСС</translation>
+        <translation type="vanished">ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="39"/>
         <source>Speed</source>
-        <translation>Скорость</translation>
+        <translation type="vanished">Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="40"/>
         <source>Altitude</source>
-        <translation>Высота</translation>
+        <translation type="vanished">Высота</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="41"/>
         <source>Torque</source>
-        <translation>Крутящий момент</translation>
+        <translation type="vanished">Крутящий момент</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="42"/>
         <source>AEPF</source>
-        <translation>AEPF</translation>
+        <translation type="vanished">AEPF</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="43"/>
         <source>CPV</source>
-        <translation>CPV</translation>
+        <translation type="vanished">CPV</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="44"/>
         <source>Time</source>
-        <translation>Время</translation>
+        <translation type="vanished">Время</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="45"/>
         <source>Distance</source>
-        <translation>Дистанция</translation>
+        <translation type="vanished">Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="46"/>
         <source>Slope</source>
-        <translation>Наклон</translation>
+        <translation type="vanished">Наклон</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="47"/>
         <source>Latitude</source>
-        <translation>Широта</translation>
+        <translation type="vanished">Широта</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="48"/>
         <source>Longitude</source>
-        <translation>Долгота</translation>
+        <translation type="vanished">Долгота</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="49"/>
         <source>L/R Balance</source>
-        <translation>Баланс Л/П</translation>
+        <translation type="vanished">Баланс Л/П</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="50"/>
         <source>Running Vertical Oscillation</source>
-        <translation>Вертикальное колебание (бег)</translation>
+        <translation type="vanished">Вертикальное колебание (бег)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="51"/>
         <source>Running Cadence</source>
-        <translation>Каденс бега</translation>
+        <translation type="vanished">Каденс бега</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="52"/>
         <source>Running GCT</source>
-        <translation>Время контакта с землёй (бег)</translation>
+        <translation type="vanished">Время контакта с землёй (бег)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="53"/>
         <source>Gear Ratio</source>
-        <translation>Передаточное отношение</translation>
+        <translation type="vanished">Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="54"/>
         <source>Muscle Oxygen</source>
-        <translation>Кислород в мышцах</translation>
+        <translation type="vanished">Кислород в мышцах</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="55"/>
         <source>Haemoglobin Mass</source>
-        <translation>Масса гемоглобина</translation>
+        <translation type="vanished">Масса гемоглобина</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="83"/>
         <source>Analyse</source>
-        <translation>Анализировать</translation>
+        <translation type="vanished">Анализировать</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="90"/>
         <source>X-Axis:</source>
-        <translation>Ось X:</translation>
+        <translation type="vanished">Ось X:</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="96"/>
         <source>Y-Axis:</source>
-        <translation>Ось Y:</translation>
+        <translation type="vanished">Ось Y:</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="102"/>
         <source>Z-Axis:</source>
-        <translation>Ось Z:</translation>
+        <translation type="vanished">Ось Z:</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="109"/>
         <source>Color:</source>
-        <translation>Цвет:</translation>
+        <translation type="vanished">Цвет:</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="117"/>
         <source>Bin Width:</source>
-        <translation>Ширина столбца:</translation>
+        <translation type="vanished">Ширина столбца:</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="343"/>
         <source>User Defined</source>
-        <translation>Указано пользователем</translation>
+        <translation type="vanished">Указано пользователем</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="344"/>
-        <source>Natural Cadence Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="345"/>
         <source>Route Visualisation</source>
-        <translation>Визуализация маршрута</translation>
+        <translation type="vanished">Визуализация маршрута</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="346"/>
-        <source>Power Fatigue</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="347"/>
         <source>Impact of Altitude</source>
-        <translation>Воздействие высоты</translation>
+        <translation type="vanished">Воздействие высоты</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="105"/>
-        <location filename="../../Charts/ModelWindow.cpp" line="113"/>
         <source>Time at X&amp;Y</source>
-        <translation>Время по X&amp;Y</translation>
+        <translation type="vanished">Время по X&amp;Y</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="112"/>
         <source>Power Zone</source>
-        <translation>Зона мощности</translation>
+        <translation type="vanished">Зона мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="133"/>
         <source>Bar</source>
-        <translation>Столбцы</translation>
+        <translation type="vanished">Столбцы</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="134"/>
         <source>Grid</source>
-        <translation>Сетка</translation>
+        <translation type="vanished">Сетка</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="135"/>
         <source>Surface</source>
-        <translation>Поверхность</translation>
+        <translation type="vanished">Поверхность</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="136"/>
         <source>Dots</source>
-        <translation>Точки</translation>
+        <translation type="vanished">Точки</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="140"/>
         <source>Ignore Zero</source>
-        <translation>Исключить нули</translation>
+        <translation type="vanished">Исключить нули</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="144"/>
         <source>Show Grid</source>
-        <translation>Показать сетку</translation>
+        <translation type="vanished">Показать сетку</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="148"/>
         <source>Frame Intervals</source>
-        <translation>Отмеченные интервалы</translation>
+        <translation type="vanished">Отмеченные интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/ModelWindow.cpp" line="152"/>
         <source>Legend</source>
-        <translation>Легенда</translation>
+        <translation type="vanished">Легенда</translation>
     </message>
 </context>
 <context>
@@ -19287,19 +20394,11 @@ No rides found to import.
 <context>
     <name>MultiDeviceDialog</name>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2293"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2485"/>
         <source>Multiple Device Configuration</source>
         <translation>Настройка нескольких устройств</translation>
     </message>
 </context>
-<context>
-    <name>IsoPower</name>
-    <message>
-        <location filename="../../Metrics/Coggan.cpp" line="50"/>
-        <source>Iso Power is an estimate of the power that you could have maintained for the same physiological &apos;cost&apos; if your power output had been perfectly constant.</source>
-        <translation>Нормализованная мощность (IsoPower) - это показатель того, какую мощность вам необходимо было бы прикладывать для достижения таких же физиологических затрат, если бы ваша мощность была постоянной.</translation>
-    </message>
-</context>
 <context>
     <name>NamedSearches</name>
     <message>
@@ -19321,27 +20420,27 @@ No rides found to import.
 <context>
     <name>NavigatorCellDelegate</name>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1120"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1122"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1122"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1124"/>
         <source>MMM d, yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1123"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1125"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1126"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1128"/>
         <source>Last updated</source>
         <translation>Последнее обновление</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="1129"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="1131"/>
         <source>ddd MMM d, yyyy hh:mm</source>
         <translation>d MMM yyyy, ddd, hh:mm</translation>
     </message>
@@ -19470,7 +20569,7 @@ No rides found to import.
         <location filename="../../Gui/NewCyclistDialog.cpp" line="221"/>
         <location filename="../../Gui/NewCyclistDialog.cpp" line="239"/>
         <source>Height (%1)</source>
-        <translation>Высота (%1)</translation>
+        <translation type="unfinished">Рост (%1)</translation>
     </message>
     <message>
         <location filename="../../Gui/NewCyclistDialog.cpp" line="52"/>
@@ -19550,18 +20649,18 @@ No rides found to import.
 <context>
     <name>NinetyFivePercentHeartRate</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2352"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2410"/>
         <source>95% Heartrate</source>
         <translation>95% ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2353"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2354"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2411"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2412"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2356"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2414"/>
         <source>Heart Rate for which 95% of activity samples has lower HR values</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19569,18 +20668,18 @@ No rides found to import.
 <context>
     <name>NonZeroPower</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1160"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1218"/>
         <source>Nonzero Average Power</source>
         <translation>Ненулевая средняя мощность</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1161"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1162"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1219"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1220"/>
         <source>watts</source>
         <translation>ватт</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1164"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1222"/>
         <source>Average Power without zero values, it gives inflated values when frecuent coasting is present</source>
         <translation type="unfinished"></translation>
     </message>
@@ -19588,238 +20687,370 @@ No rides found to import.
 <context>
     <name>OAuthDialog</name>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="46"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="40"/>
         <source>OAuth</source>
         <translation>OAuth</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="64"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="61"/>
         <source>SSL Security Libraries required for &apos;Authorise&apos; are missing in this installation.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Отсутствует библиотека SSL Security Libraries, необходимая для авторизации.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="65"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="262"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="584"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="62"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="502"/>
         <source>Authorization Error</source>
         <translation>Ошибка авторизации</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="261"/>
         <source>Error fetching OAuth credentials - Endpoint: /oauth/access_token</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ошибка получения учётных данных OAuth - Конечная точка: /oauth/access_token</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="276"/>
         <source>Twitter authorization was successful.</source>
-        <translation>Авторизация в Twitter прошла успешно.</translation>
+        <translation type="vanished">Авторизация в Twitter прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="283"/>
         <source>Withings authorization was successful.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Авторизация в Withings прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="287"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="594"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="603"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="640"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="647"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="653"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="662"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="673"/>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="679"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="514"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="523"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="560"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="567"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="574"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="584"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="593"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="602"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="608"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="633"/>
         <source>Information</source>
         <translation>Информация</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="302"/>
         <source>Error in authorization</source>
-        <translation>Ошибка при авторизации</translation>
+        <translation type="vanished">Ошибка при авторизации</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="303"/>
         <source>There was an error during authorization. Please check the error description.</source>
-        <translation>В ходе авторизации произошла ошибка. Прочитайте описание ошибки.</translation>
+        <translation type="vanished">В ходе авторизации произошла ошибка. Прочитайте описание ошибки.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="593"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="513"/>
         <source>Dropbox authorization was successful.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Авторизация в Dropbox прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="602"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="522"/>
         <source>SportTracks authorization was successful.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Авторизация в SportTracks прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="639"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="559"/>
         <source>PolarFlow authorization was successful.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Авторизация в PolarFlow прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="646"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="566"/>
         <source>Strava authorization was successful.</source>
         <translation>Авторизация в Strava прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="652"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="573"/>
         <source>Cycling Analytics authorization was successful.</source>
         <translation>Авторизация в Cycling Analytics прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="660"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="582"/>
         <source>Google Calendar authorization was successful.</source>
         <translation>Авторизация в Google Calendar прошла успешно.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="672"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="592"/>
+        <source>Kent University Google Drive authorization was successful.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="601"/>
         <source>Google Drive authorization was successful.</source>
+        <translation type="unfinished">Авторизация в Google Drive прошла успешно.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="632"/>
+        <source>Withings/Nokia authorization was successful.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="684"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="641"/>
         <source>Error retrieving access token, %1 (%2)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка получения токена доступа, %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="685"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="642"/>
         <source>SSL Token Refresh Error</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ошибка обновления SSL токена</translation>
     </message>
     <message>
         <source>Select</source>
         <translation type="obsolete">Выбор</translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="678"/>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="607"/>
         <source>Today&apos;s Plan authorization was successful.</source>
+        <translation type="unfinished">Авторизация в Today&apos;s Plan прошла успешно.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OAuthDialog.cpp" line="501"/>
+        <source>Error retrieving authoriation credentials</source>
+        <translation type="unfinished">Ошибка получения данных авторизации</translation>
+    </message>
+</context>
+<context>
+    <name>OpenData</name>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="118"/>
+        <source>Fetching server list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/OAuthDialog.cpp" line="582"/>
-        <source>Error retrieving authoriation credentials</source>
+        <location filename="../../Cloud/OpenData.cpp" line="133"/>
+        <source>Network Problem reading server list</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="149"/>
+        <source>Invalid server list, please try again later</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="159"/>
+        <source>Finding an available server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="202"/>
+        <source>No servers available, please try later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="212"/>
+        <source>Preparing data to send.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="287"/>
+        <source>Sending data to server.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="330"/>
+        <source>Server replied:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="339"/>
+        <source>Finishing.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="348"/>
+        <source>Done</source>
+        <translation type="unfinished">Закрыть</translation>
+    </message>
+</context>
+<context>
+    <name>OpenDataDialog</name>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="357"/>
+        <source>OpenData</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="373"/>
+        <source>&lt;b&gt;&lt;big&gt;OpenData Project&lt;/big&gt;&lt;/b&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="383"/>
+        <source>We have started a new project to collect user activity data to enable researchers, coaches and others to develop new models and solutions using real world data.&lt;p&gt;All data that is shared is &lt;b&gt;anonymous&lt;/b&gt; and cannot be traced back to the original user, no personal data is shared and the workout data is limited to Power, Heartrate, Altitude, Cadence and Distance data along with metrics and distributions. No personally identifiable information is collected at all.&lt;p&gt;The data will be published to the general public in exactly the same format you have provided it in. And you can choose to remove your data at any time. You can also choose to opt out again in athlete preferences.&lt;p&gt;&lt;center&gt;Your data will only be sent once every year or so.&lt;/center&gt;&lt;br&gt;&lt;b&gt;WE WILL NOT&lt;/b&gt;:&lt;p&gt;- Collect personal information &lt;p&gt;- Collect GPS information &lt;p&gt;- Collect notes or other metadata  &lt;p&gt;&lt;p&gt;&lt;br&gt;&lt;b&gt;WE WILL&lt;/b&gt;:&lt;p&gt;- Collect basic athlete info: Gender, Year of Birth and UUID&lt;p&gt;- Collect basic activity samples for HR, Cadence, Power, Distance, Altitude&lt;p&gt;- Collect metrics for every activity stored for this athlete&lt;p&gt;- Collect distribution and mean-max aggregates of activity data&lt;p&gt;&lt;p&gt;&lt;br&gt;We publish the data at the &lt;a href=&quot;https://cos.io/&quot;&gt;Center for Open Science&lt;/a&gt; as an &lt;a href=&quot;https://osf.io/6hfpz/&quot;&gt;OpenData project&lt;/a&gt; open to everyone. &lt;p&gt;We have also setup an &lt;a href=&quot;https://github.com/GoldenCheetah/OpenData&quot;&gt;OpenData github project&lt;/a&gt; to publish tools for working with the dataset.&lt;p&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="416"/>
+        <source>Yes, I want to share</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/OpenData.cpp" line="419"/>
+        <source>No thanks</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OverviewWindow</name>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="171"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="179"/>
         <source>PMC</source>
         <translation type="unfinished">PMC</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="172"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="180"/>
         <source>Sport</source>
         <translation type="unfinished">Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="173"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="181"/>
         <source>Workout Code</source>
         <translation type="unfinished">Название тренировки</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="174"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="182"/>
         <source>Duration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="175"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="183"/>
         <source>Notes</source>
         <translation type="unfinished">Заметки</translation>
     </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="178"/>
-        <source>HRV</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="179"/>
-        <source>Heartrate</source>
-        <translation type="unfinished">ЧСС</translation>
-    </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="180"/>
-        <source>Heartrate Zones</source>
-        <translation type="unfinished">Зоны ЧСС</translation>
-    </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="181"/>
-        <source>Climbing</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="182"/>
-        <source>Cadence</source>
-        <translation type="unfinished">Каденс</translation>
-    </message>
-    <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="183"/>
-        <source>Equivalent Power</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="../../Charts/OverviewWindow.cpp" line="186"/>
-        <source>RPE</source>
+        <source>HRV rMSSD</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../Charts/OverviewWindow.cpp" line="187"/>
+        <source>Heartrate</source>
+        <translation type="unfinished">ЧСС</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="188"/>
+        <source>Heartrate Zones</source>
+        <translation type="unfinished">Зоны ЧСС</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="189"/>
+        <source>Climbing</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="190"/>
+        <source>Cadence</source>
+        <translation type="unfinished">Каденс</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="191"/>
+        <source>Equivalent Power</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="194"/>
+        <source>RPE</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/OverviewWindow.cpp" line="195"/>
         <source>Stress</source>
         <translation type="unfinished">Нагрузка</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="188"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="196"/>
         <source>Fatigue Zones</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="189"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="197"/>
         <source>Intervals</source>
         <translation type="unfinished">Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="192"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="200"/>
         <source>Intensity</source>
         <translation type="unfinished">Интенсивность</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="193"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="201"/>
         <source>Power</source>
         <translation type="unfinished">Мощность</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="194"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="202"/>
         <source>Power Zones</source>
         <translation type="unfinished">Зоны мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="195"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="203"/>
         <source>Power Model</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="198"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="206"/>
         <source>Distance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="199"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="207"/>
         <source>Speed</source>
         <translation type="unfinished">Скорость</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="200"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="208"/>
         <source>Pace Zones</source>
         <translation type="unfinished">Зоны темпа</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="201"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="209"/>
         <source>Route</source>
         <translation type="unfinished">Маршрут</translation>
     </message>
 </context>
+<context>
+    <name>PDModel</name>
+    <message>
+        <location filename="../../Metrics/PDModel.h" line="115"/>
+        <source>W&apos;: Formerly known as Anaerobic Work Capacity (AWC). An estimate for the fixed amount of work, expressed in kJ, that you can do above Critical Power.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PDModel.h" line="116"/>
+        <source>Critical Power. An estimate of the power that, theoretically, can be maintained for a long time without fatigue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PDModel.h" line="117"/>
+        <source>Functional Threshold Power. The highest power that a rider can maintain in a quasi-steady state without fatiguing for approximately one hour.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PDModel.h" line="118"/>
+        <source>P-max: An estimate of the maximal power over one full rotation of the cranks.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>PMCData</name>
+    <message>
+        <location filename="../../Metrics/PMCData.cpp" line="627"/>
+        <source>CTL/LTS : Chronic Training Load/Long Term Stress. The the dose of training you accumulated over a longer period of time, computed as an exponentially weighted moving average of the selected Training Load metric typically from 4-8 weeks, 42 days by default. It is claimed to relate to your fitness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PMCData.cpp" line="632"/>
+        <source>ATL/STS : Acute Training Load/Short Term Stress. The dose of training that you accumulated over a short period of time, computed as an exponentially weighted moving average of the selected Training Load metric from 3 to 10 days in general, 7 by default. It is claimed to relate to your fatigue.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PMCData.cpp" line="637"/>
+        <source>TSB/SB : Training Stress Balance/Stress Balance. It&apos;s the result of subtracting yesterday&apos;s Acute Training Load/Short Term Stress from yesterday&apos;s Chronic Training Load/Long Term Stress. It is claimed to relate to your freshness.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PMCData.cpp" line="642"/>
+        <source>RR : Ramp Rate. The rate at which CTL/LTS increases over a given time period. Large values up and down indicate a risk of injury and aggressive taper respectively.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Pace</name>
     <message>
@@ -19846,54 +21077,54 @@ No rides found to import.
 <context>
     <name>PaceSchemePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5202"/>
+        <location filename="../../Gui/Pages.cpp" line="5738"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5203"/>
+        <location filename="../../Gui/Pages.cpp" line="5739"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5208"/>
+        <location filename="../../Gui/Pages.cpp" line="5744"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5209"/>
+        <location filename="../../Gui/Pages.cpp" line="5745"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5218"/>
+        <location filename="../../Gui/Pages.cpp" line="5754"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5219"/>
+        <location filename="../../Gui/Pages.cpp" line="5755"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5220"/>
+        <location filename="../../Gui/Pages.cpp" line="5756"/>
         <source>Percent of CV</source>
         <translation>Процент от критической скорости</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5265"/>
+        <location filename="../../Gui/Pages.cpp" line="5801"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5288"/>
-        <location filename="../../Gui/Pages.cpp" line="5295"/>
+        <location filename="../../Gui/Pages.cpp" line="5824"/>
+        <location filename="../../Gui/Pages.cpp" line="5831"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5290"/>
-        <location filename="../../Gui/Pages.cpp" line="5297"/>
+        <location filename="../../Gui/Pages.cpp" line="5826"/>
+        <location filename="../../Gui/Pages.cpp" line="5833"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -20054,27 +21285,27 @@ No rides found to import.
 <context>
     <name>PaceZonePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5129"/>
+        <location filename="../../Gui/Pages.cpp" line="5665"/>
         <source>Sport</source>
         <translation>Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5131"/>
+        <location filename="../../Gui/Pages.cpp" line="5667"/>
         <source>Run</source>
         <translation>Бег</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5132"/>
+        <location filename="../../Gui/Pages.cpp" line="5668"/>
         <source>Swim</source>
         <translation>Плавание</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5173"/>
+        <location filename="../../Gui/Pages.cpp" line="5709"/>
         <source>Critical Velocity</source>
         <translation>Критический темп</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5174"/>
+        <location filename="../../Gui/Pages.cpp" line="5710"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
@@ -20318,133 +21549,133 @@ No rides found to import.
         <translation>Невозможно открыть файл</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="196"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="197"/>
         <source>Zone defaults must be specified at head of %1 file</source>
         <translation type="unfinished">Зоны по умолчанию должны быть заданы в заголовке файла %1</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="202"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="203"/>
         <source>Only one set of zone defaults may be specified in %1 file</source>
         <translation type="unfinished">Только один набор зон по умолчанию может быть задан в файле %1</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="228"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="229"/>
         <source>line %1: read new range without reading any zones for previous one</source>
         <translation type="unfinished">строка %1: чтение нового диапазона без чтения уровней для предшествующего</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="290"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="291"/>
         <source>line %1: read zone without preceding date range</source>
         <translation type="unfinished">строка %1: чтение уровня без предшествующего диапазона дат</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="312"/>
-        <location filename="../../Metrics/PaceZones.cpp" line="342"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="313"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="343"/>
         <source>attempt to set zone based on % of CV without setting CV in line number %1.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="383"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="384"/>
         <source>file ended without reading any zones for last range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="436"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="437"/>
         <source>Setting end date of range %1 to start date of range %2.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="446"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="447"/>
         <source>Extending final range %1 to infinite to include present date.
 </source>
         <translation type="unfinished">Расширение конечного диапазона %1 до бесконечности, чтобы включить текущую дату.
 </translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="453"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="454"/>
         <source>CV must be greater than zero in zone range %1 of %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="476"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="477"/>
         <source>Range %1: matching top of zone %2 (%3) to bottom of zone %4 (%5).
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="490"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="491"/>
         <source>Range %1: setting top of zone %2 from %3 to MAX.
 </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="696"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="697"/>
         <source>Critical Velocity: %3%4 (%2%1)</source>
         <translation>Критический темп: %3 %4 (%2 км/ч)</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="704"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="705"/>
         <source>&lt;td align=&quot;center&quot;&gt;Zone&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Зона&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="705"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="706"/>
         <source>&lt;td align=&quot;center&quot;&gt;Description&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Описание&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="706"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="707"/>
         <source>&lt;td align=&quot;center&quot;&gt;Low (%1)&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Нижняя граница (%1)&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="707"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="708"/>
         <source>&lt;td align=&quot;center&quot;&gt;High (%1)&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Верхняя граница (%1)&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="708"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="709"/>
         <source>&lt;td align=&quot;center&quot;&gt;Time&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Время&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="709"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="710"/>
         <source>&lt;td align=&quot;center&quot;&gt;%&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;%&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="827"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="828"/>
         <source>Problem Saving Pace Zones</source>
         <translation>Не удалось сохранить зоны темпа</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="828"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="829"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation type="unfinished">Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="1014"/>
-        <location filename="../../Metrics/PaceZones.cpp" line="1030"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1015"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1031"/>
         <source>min/100m</source>
         <translation>мин/100м</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="1014"/>
-        <location filename="../../Metrics/PaceZones.cpp" line="1031"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1015"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1032"/>
         <source>min/100yd</source>
         <translation>мин/100 ярдов</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="1016"/>
-        <location filename="../../Metrics/PaceZones.cpp" line="1028"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1017"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1029"/>
         <source>min/km</source>
         <translation>мин/км</translation>
     </message>
     <message>
-        <location filename="../../Metrics/PaceZones.cpp" line="1016"/>
-        <location filename="../../Metrics/PaceZones.cpp" line="1029"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1017"/>
+        <location filename="../../Metrics/PaceZones.cpp" line="1030"/>
         <source>min/mile</source>
         <translation>мин/миля</translation>
     </message>
@@ -20660,6 +21891,146 @@ Do you want to continue?</source>
 Продолжить?</translation>
     </message>
 </context>
+<context>
+    <name>PeakHr10m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="245"/>
+        <source>10 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="246"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="247"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr1m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="150"/>
+        <source>1 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="151"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="152"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr20m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="264"/>
+        <source>20 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="265"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="266"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr2m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="169"/>
+        <source>2 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="170"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="171"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr30m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="283"/>
+        <source>30 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="284"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="285"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr3m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="188"/>
+        <source>3 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="189"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="190"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr5m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="207"/>
+        <source>5 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="208"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="209"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr60m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="302"/>
+        <source>60 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="303"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="304"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr8m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="226"/>
+        <source>8 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="227"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="228"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
+<context>
+    <name>PeakHr90m</name>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="321"/>
+        <source>90 min Peak Hr</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/PeakHr.cpp" line="322"/>
+        <location filename="../../Metrics/PeakHr.cpp" line="323"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+</context>
 <context>
     <name>PeakPace10m</name>
     <message>
@@ -21647,7 +23018,7 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Metrics/WattsPerKilogram.cpp" line="277"/>
         <source>10 min Peak Power relative to Athlete Weight.</source>
-        <translation type="unfinished">Отношение пиковой мощности за 60 минут к весу спортсмена. {10 ?}</translation>
+        <translation type="unfinished">Отношение пиковой мощности за 10 минут к весу спортсмена.</translation>
     </message>
 </context>
 <context>
@@ -21686,7 +23057,7 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Metrics/WattsPerKilogram.cpp" line="241"/>
         <source>1 min Peak Power relative to Athlete Weight.</source>
-        <translation type="unfinished">Отношение пиковой мощности за 60 минут к весу спортсмена. {1 ?}</translation>
+        <translation type="unfinished">Отношение пиковой мощности за 1 минуту к весу спортсмена.</translation>
     </message>
 </context>
 <context>
@@ -21712,7 +23083,7 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Metrics/WattsPerKilogram.cpp" line="295"/>
         <source>20 min Peak Power relative to Athlete Weight.</source>
-        <translation type="unfinished">Отношение пиковой мощности за 60 минут к весу спортсмена. {20 ?}</translation>
+        <translation type="unfinished">Отношение пиковой мощности за 20 минут к весу спортсмена.</translation>
     </message>
 </context>
 <context>
@@ -21738,7 +23109,7 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Metrics/WattsPerKilogram.cpp" line="313"/>
         <source>30 min Peak Power relative to Athlete Weight.</source>
-        <translation type="unfinished">Отношение пиковой мощности за 60 минут к весу спортсмена. {30 ?}</translation>
+        <translation type="unfinished">Отношение пиковой мощности за 30 минут к весу спортсмена.</translation>
     </message>
 </context>
 <context>
@@ -21764,7 +23135,7 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Metrics/WattsPerKilogram.cpp" line="259"/>
         <source>5 min Peak Power relative to Athlete Weight.</source>
-        <translation type="unfinished">Отношение пиковой мощности за 60 минут к весу спортсмена. {5 ?}</translation>
+        <translation type="unfinished">Отношение пиковой мощности за 5 минут к весу спортсмена.</translation>
     </message>
 </context>
 <context>
@@ -21902,17 +23273,17 @@ Do you want to continue?</source>
     <message>
         <location filename="../../Cloud/PolarFlow.cpp" line="110"/>
         <source>Network Problem reading PolarFlow data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Проблемы с сетью при чтении данных PolarFlow</translation>
     </message>
     <message>
         <location filename="../../Cloud/PolarFlow.cpp" line="132"/>
         <source>problem parsing PolarFlow data</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">проблема с разбором данных от PolarFlow</translation>
     </message>
     <message>
         <location filename="../../Cloud/PolarFlow.cpp" line="158"/>
         <source>You must authorise with Today&apos;s Plan first</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Вы должны вначале авторизоваться на Today&apos;s Plan</translation>
     </message>
     <message>
         <location filename="../../Cloud/PolarFlow.cpp" line="219"/>
@@ -21920,194 +23291,194 @@ Do you want to continue?</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/PolarFlow.h" line="46"/>
+        <location filename="../../Cloud/PolarFlow.h" line="47"/>
         <source>PolarFlow</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">PolarFlow</translation>
     </message>
     <message>
-        <location filename="../../Cloud/PolarFlow.h" line="47"/>
+        <location filename="../../Cloud/PolarFlow.h" line="48"/>
         <source>Download from the popular Polar website.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Скачать с популярного сайта Polar.</translation>
     </message>
 </context>
 <context>
     <name>PowerHist</name>
     <message>
         <location filename="../../Charts/PowerHist.cpp" line="88"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2352"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2370"/>
         <source>Time (minutes)</source>
         <translation>Время (минуты)</translation>
     </message>
     <message>
         <location filename="../../Charts/PowerHist.cpp" line="88"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2352"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2370"/>
         <source>Time (percent)</source>
         <translation>Время (%)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2307"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2325"/>
         <source>Power (watts)</source>
         <translation>Мощность (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2306"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2311"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2324"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2329"/>
         <source>Power zone</source>
         <translation>Зона мощности</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2317"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2335"/>
         <source>Heartrate (bpm)</source>
         <translation>ЧСС (уд/мин)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2316"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2334"/>
         <source>Heartrate zone</source>
         <translation>Зона ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1718"/>
-        <location filename="../../Charts/PowerHist.cpp" line="1756"/>
-        <location filename="../../Charts/PowerHist.cpp" line="1772"/>
-        <location filename="../../Charts/PowerHist.cpp" line="1794"/>
-        <location filename="../../Charts/PowerHist.cpp" line="1796"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1736"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1774"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1790"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1812"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1814"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1799"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1817"/>
         <source>Total %1 (%2)</source>
         <translation>Всего %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1801"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1819"/>
         <source>Total %1</source>
         <translation>Всего %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1804"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1822"/>
         <source>%1 of Activity (%2)</source>
         <translation>%1 тренировки (%2)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1806"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1824"/>
         <source>%1 of Activity</source>
         <translation>%1 тренировки</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2301"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2319"/>
         <source>W&apos;bal zone</source>
         <translation>Зона W&apos;bal</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2302"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2320"/>
         <source>W&apos;Bal Consumed (%)</source>
         <translation>Израсходовано W&apos;Bal (%)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2312"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2330"/>
         <source>Power (watts/kg)</source>
         <translation>Мощность (Вт/кг)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2321"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2339"/>
         <source>aPower (watts)</source>
         <translation>aPower (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2325"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2343"/>
         <source>Cadence (rpm)</source>
         <translation>Каденс (об/мин)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2330"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2348"/>
         <source>Pace zone</source>
         <translation>Зона темпа</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2332"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2350"/>
         <source>Speed (%1)</source>
         <translation>Скорость (%1)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2332"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2350"/>
         <source>kph</source>
         <translation>км/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2332"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2350"/>
         <source>mph</source>
         <translation>миль/ч</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2336"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2354"/>
         <source>Torque (%1)</source>
         <translation>Крутящий момент (%1)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2336"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2354"/>
         <source>N-m</source>
         <translation>Н-м</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2336"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2354"/>
         <source>ft-lbf</source>
         <translation>ft-lbf</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2340"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2358"/>
         <source>Gear Ratio</source>
         <translation>Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2344"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2362"/>
         <source>SmO2</source>
         <translation>SmO₂</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2348"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2366"/>
         <source>Unknown data series</source>
         <translation>Неизвестная серия данных</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2442"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2460"/>
         <source>min/km</source>
         <translation>мин/км</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2442"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2460"/>
         <source>min/mile</source>
         <translation>мин/миля</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2443"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2448"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2461"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2466"/>
         <source>
 %1 Pace (%2)</source>
         <translation>
 Темп %1 (%2)</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2447"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2465"/>
         <source>min/100m</source>
         <translation>мин/100м</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2447"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2465"/>
         <source>min/100yd</source>
         <translation>мин/100 ярдов</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="1794"/>
-        <location filename="../../Charts/PowerHist.cpp" line="1796"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2428"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2455"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1812"/>
+        <location filename="../../Charts/PowerHist.cpp" line="1814"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2446"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2473"/>
         <source>minutes</source>
         <translation>минут</translation>
     </message>
     <message>
-        <location filename="../../Charts/PowerHist.cpp" line="2428"/>
-        <location filename="../../Charts/PowerHist.cpp" line="2455"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2446"/>
+        <location filename="../../Charts/PowerHist.cpp" line="2473"/>
         <source>%</source>
         <translation>%</translation>
     </message>
@@ -22260,32 +23631,32 @@ on and that its display says, &quot;Host&quot;</source>
 <context>
     <name>ProcessorPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3314"/>
+        <location filename="../../Gui/Pages.cpp" line="3850"/>
         <source>Processor</source>
         <translation>Обработка</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3315"/>
+        <location filename="../../Gui/Pages.cpp" line="3851"/>
         <source>Apply</source>
         <translation>Применить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3316"/>
+        <location filename="../../Gui/Pages.cpp" line="3852"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3345"/>
+        <location filename="../../Gui/Pages.cpp" line="3881"/>
         <source>Manual</source>
         <translation>вручную</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3346"/>
+        <location filename="../../Gui/Pages.cpp" line="3882"/>
         <source>Import</source>
         <translation>при импорте</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3347"/>
+        <location filename="../../Gui/Pages.cpp" line="3883"/>
         <source>Save</source>
         <translation type="unfinished">Сохранить</translation>
     </message>
@@ -22294,6 +23665,22 @@ on and that its display says, &quot;Host&quot;</source>
         <translation type="vanished">Автоматический</translation>
     </message>
 </context>
+<context>
+    <name>PythonChart</name>
+    <message>
+        <location filename="../../Charts/PythonChart.cpp" line="287"/>
+        <source>Show Console</source>
+        <translation>Показать консоль</translation>
+    </message>
+</context>
+<context>
+    <name>PythonConsole</name>
+    <message>
+        <location filename="../../Charts/PythonChart.cpp" line="49"/>
+        <source>Python Console (%1)</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>QObject</name>
     <message>
@@ -22318,21 +23705,22 @@ on and that its display says, &quot;Host&quot;</source>
         <translation>Велогонка</translation>
     </message>
     <message>
-        <location filename="../../FileIO/FitRideFile.cpp" line="1182"/>
-        <location filename="../../FileIO/FitRideFile.cpp" line="2149"/>
+        <location filename="../../FileIO/FitRideFile.cpp" line="1395"/>
+        <location filename="../../FileIO/FitRideFile.cpp" line="2381"/>
+        <location filename="../../FileIO/TcxParser.cpp" line="410"/>
         <source>Lap %1</source>
         <translation>Круг %1</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.h" line="214"/>
-        <location filename="../../Charts/LTMPlot.h" line="220"/>
+        <location filename="../../Charts/LTMPlot.h" line="219"/>
+        <location filename="../../Charts/LTMPlot.h" line="225"/>
         <source>MMM dd
 yyyy</source>
         <translation>dd MMM
 yyyy</translation>
     </message>
     <message>
-        <location filename="../../Charts/LTMPlot.h" line="242"/>
+        <location filename="../../Charts/LTMPlot.h" line="247"/>
         <source>All</source>
         <translation>Все</translation>
     </message>
@@ -22412,62 +23800,48 @@ yyyy</translation>
         <translation>Велозаезд %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="53"/>
-        <source>Manual entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="55"/>
         <source>Withings</source>
-        <translation type="unfinished">Withings</translation>
+        <translation type="obsolete">Withings</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="57"/>
         <source>Today&apos;s Plan</source>
-        <translation type="unfinished">Today&apos;s Plan</translation>
+        <translation type="obsolete">Today&apos;s Plan</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="59"/>
-        <source>CSV Upload</source>
+        <location filename="../../Core/BodyMeasures.cpp" line="56"/>
+        <source>Problem Saving Body Measurements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="61"/>
-        <source>Unknown</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="74"/>
-        <source>Problem Saving Body Measures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="75"/>
+        <location filename="../../Core/BodyMeasures.cpp" line="57"/>
+        <location filename="../../Core/HrvMeasures.cpp" line="59"/>
         <location filename="../../Core/NamedSearch.cpp" line="197"/>
         <location filename="../../Core/RouteParser.cpp" line="108"/>
-        <location filename="../../Core/SeasonParser.cpp" line="180"/>
+        <location filename="../../Core/SeasonParser.cpp" line="179"/>
         <location filename="../../FileIO/RideAutoImportConfig.cpp" line="158"/>
         <location filename="../../Train/LibraryParser.cpp" line="80"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation>Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="124"/>
-        <source>Problem Reading Body Measures</source>
+        <location filename="../../Core/BodyMeasures.cpp" line="106"/>
+        <source>Problem Reading Body Measurements</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="125"/>
+        <location filename="../../Core/BodyMeasures.cpp" line="120"/>
+        <source>Problem Parsing Body Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/BodyMeasures.cpp" line="107"/>
+        <location filename="../../Core/HrvMeasures.cpp" line="111"/>
         <source>File: %1 cannot be opened for &apos;Reading&apos;. Please check file properties.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="138"/>
-        <source>Problem Parsing Body Measures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/BodyMeasures.cpp" line="139"/>
+        <location filename="../../Core/BodyMeasures.cpp" line="121"/>
+        <location filename="../../Core/HrvMeasures.cpp" line="125"/>
         <source>File: %1 is not a proper JSON file. Parsing error: %2</source>
         <translation type="unfinished"></translation>
     </message>
@@ -22492,7 +23866,7 @@ yyyy</translation>
         <translation>Ошибка сохранения данных маршрута</translation>
     </message>
     <message>
-        <location filename="../../Core/SeasonParser.cpp" line="179"/>
+        <location filename="../../Core/SeasonParser.cpp" line="178"/>
         <source>Problem Saving Seasons</source>
         <translation>Ошибка сохранения сезонов</translation>
     </message>
@@ -22570,12 +23944,12 @@ yyyy</translation>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="156"/>
         <source>Dutch</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Голландский</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="156"/>
         <source>Swedish</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Шведский</translation>
     </message>
     <message>
         <location filename="../../Cloud/CloudDBCommon.cpp" line="160"/>
@@ -22588,70 +23962,263 @@ yyyy</translation>
         <translation>Плавание</translation>
     </message>
     <message>
-        <location filename="../../Train/ErgFile.cpp" line="617"/>
+        <location filename="../../Train/ErgFile.cpp" line="626"/>
         <source>Unsupported file format</source>
         <translation>Неподдерживаемый формат файла</translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1254"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1256"/>
         <source>Rest</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1255"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1257"/>
         <source>Very, very easy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1256"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1258"/>
         <source>Easy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1257"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1259"/>
         <source>Moderate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1258"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1260"/>
         <source>Somewhat hard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1259"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1261"/>
         <source>Hard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1260"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1262"/>
         <source>Hard+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1261"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1263"/>
         <source>Very hard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1262"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1264"/>
         <source>Very hard+</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1263"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1265"/>
         <source>Very hard++</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1264"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1266"/>
         <source>Maximum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/OverviewWindow.cpp" line="1288"/>
+        <location filename="../../Charts/OverviewWindow.cpp" line="1291"/>
         <source>Invalid</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="798"/>
+        <source>0 Rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="799"/>
+        <source>1 Very, very easy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="800"/>
+        <source>2 Easy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="801"/>
+        <source>3 Moderate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="802"/>
+        <source>4 Somewhat hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="803"/>
+        <source>5 Hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="804"/>
+        <source>6 Hard+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="805"/>
+        <source>7 Very hard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="806"/>
+        <source>8 Very hard+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="807"/>
+        <source>9 Very hard++</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="808"/>
+        <source>10 Maximum</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="811"/>
+        <source>0 Not Fatigued At All</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="812"/>
+        <source>1 </source>
+        <translation type="unfinished">1 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="813"/>
+        <source>2 A Little Fatigued</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="814"/>
+        <source>3 </source>
+        <translation type="unfinished">3 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="815"/>
+        <source>4 </source>
+        <translation type="unfinished">4 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="816"/>
+        <source>5 Moderately Fatigued</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="817"/>
+        <source>6 </source>
+        <translation type="unfinished">6 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="818"/>
+        <source>7 Very fatigued+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="819"/>
+        <source>8 </source>
+        <translation type="unfinished">8 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="820"/>
+        <source>9 </source>
+        <translation type="unfinished">9 </translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/KentUniversity.cpp" line="821"/>
+        <source>10 Total Fatigue, Nothing Left</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="58"/>
+        <source>Problem Saving HRV Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="110"/>
+        <source>Problem Reading HRV Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/HrvMeasures.cpp" line="124"/>
+        <source>Problem Parsing HRV Measurements</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="286"/>
+        <source>Developer limit exceeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="288"/>
+        <source>Monthly free plan limit exceeded</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="290"/>
+        <source>Bad request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="292"/>
+        <source>Gateway Timeout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/FixElevation.cpp" line="294"/>
+        <source>Networkerror: %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/TcxParser.cpp" line="398"/>
+        <source>Distance %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/TcxParser.cpp" line="401"/>
+        <source>Location %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/TcxParser.cpp" line="404"/>
+        <source>Time %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../FileIO/TcxParser.cpp" line="407"/>
+        <source>HeartRate %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Python/PythonEmbed.cpp" line="287"/>
+        <source>Python not installed or in path</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Python/PythonEmbed.cpp" line="287"/>
+        <source>Python v3.%1 is required for Python embedding.
+Python disabled in preferences.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../R/RTool.cpp" line="222"/>
+        <source>The version of R installed is too old. You must have R version 3.4 or higher.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../R/RTool.cpp" line="231"/>
+        <source>The version of R installed is too new. You must have R version 3.3 or older.
+</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>QwtPlotRenderer</name>
@@ -22767,205 +24334,220 @@ yyyy</translation>
 <context>
     <name>RealtimeData</name>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="418"/>
+        <location filename="../../Train/RealtimeData.cpp" line="456"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="421"/>
+        <location filename="../../Train/RealtimeData.cpp" line="459"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="424"/>
+        <location filename="../../Train/RealtimeData.cpp" line="462"/>
         <source>Lap</source>
         <translation>Круг</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="427"/>
+        <location filename="../../Train/RealtimeData.cpp" line="465"/>
         <source>Lap Time</source>
         <translation>Время круга</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="430"/>
+        <location filename="../../Train/RealtimeData.cpp" line="468"/>
         <source>Lap Time Remaining</source>
         <translation>Оставшееся время круга</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="433"/>
+        <location filename="../../Train/RealtimeData.cpp" line="471"/>
+        <source>Section Time Remaining</source>
+        <translation type="unfinished">Оставшееся время отрезка</translation>
+    </message>
+    <message>
+        <location filename="../../Train/RealtimeData.cpp" line="474"/>
         <source>BikeStress</source>
         <translation>BikeStress</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="439"/>
+        <location filename="../../Train/RealtimeData.cpp" line="480"/>
         <source>kJoules</source>
         <translation>кДж</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="442"/>
+        <location filename="../../Train/RealtimeData.cpp" line="483"/>
         <source>W&apos; bal</source>
         <translation>W&apos; bal</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="445"/>
+        <location filename="../../Train/RealtimeData.cpp" line="486"/>
         <source>XPower</source>
         <translation>XPower</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="448"/>
+        <location filename="../../Train/RealtimeData.cpp" line="489"/>
         <source>Iso Power</source>
         <translation>Нормированная мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="451"/>
+        <location filename="../../Train/RealtimeData.cpp" line="492"/>
         <source>Intensity Factor</source>
         <translation>Фактор интенсивности</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="454"/>
+        <location filename="../../Train/RealtimeData.cpp" line="495"/>
         <source>Relative Intensity</source>
         <translation>Относительная интенсивность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="457"/>
+        <location filename="../../Train/RealtimeData.cpp" line="498"/>
         <source>Skiba Variability Index</source>
         <translation>Индекс вариабельности по Скиба</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="460"/>
+        <location filename="../../Train/RealtimeData.cpp" line="501"/>
         <source>Variability Index</source>
         <translation>Индекс вариабельности</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="463"/>
+        <location filename="../../Train/RealtimeData.cpp" line="504"/>
         <source>Distance</source>
         <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="466"/>
+        <location filename="../../Train/RealtimeData.cpp" line="507"/>
         <source>Alternate Power</source>
         <translation>Альтернативная мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="469"/>
+        <location filename="../../Train/RealtimeData.cpp" line="510"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="472"/>
+        <location filename="../../Train/RealtimeData.cpp" line="513"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="475"/>
+        <location filename="../../Train/RealtimeData.cpp" line="516"/>
         <source>Virtual Speed</source>
         <translation>Виртуальная скорость</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="478"/>
+        <location filename="../../Train/RealtimeData.cpp" line="519"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="481"/>
+        <location filename="../../Train/RealtimeData.cpp" line="522"/>
         <source>Heart Rate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="484"/>
+        <location filename="../../Train/RealtimeData.cpp" line="525"/>
         <source>Target Power</source>
         <translation>Целевая мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="487"/>
+        <location filename="../../Train/RealtimeData.cpp" line="528"/>
         <source>Average Power</source>
         <translation>Средняя мощность</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="490"/>
+        <location filename="../../Train/RealtimeData.cpp" line="531"/>
         <source>Average Speed</source>
         <translation>Средняя скорость</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="493"/>
+        <location filename="../../Train/RealtimeData.cpp" line="534"/>
         <source>Average Heartrate</source>
         <translation>Средняя ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="496"/>
+        <location filename="../../Train/RealtimeData.cpp" line="537"/>
         <source>Average Cadence</source>
         <translation>Средний каденс</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="499"/>
+        <location filename="../../Train/RealtimeData.cpp" line="540"/>
         <source>Lap Power</source>
         <translation>Мощность на круг</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="502"/>
+        <location filename="../../Train/RealtimeData.cpp" line="543"/>
         <source>Lap Speed</source>
         <translation>Скорость на круг</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="505"/>
+        <location filename="../../Train/RealtimeData.cpp" line="546"/>
         <source>Lap Heartrate</source>
         <translation>ЧСС на круг</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="508"/>
+        <location filename="../../Train/RealtimeData.cpp" line="549"/>
         <source>Lap Cadence</source>
         <translation>Каденс на круг</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="511"/>
+        <location filename="../../Train/RealtimeData.cpp" line="552"/>
         <source>Left/Right Balance</source>
         <translation>Левый/правый баланс</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="514"/>
+        <location filename="../../Train/RealtimeData.cpp" line="555"/>
         <source>Total Hb Mass</source>
         <translation>Общая масса ГГ</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="517"/>
+        <location filename="../../Train/RealtimeData.cpp" line="558"/>
         <source>Hb O2 Saturation</source>
         <translation>Насыщение Hb O2</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="520"/>
+        <location filename="../../Train/RealtimeData.cpp" line="561"/>
         <source>Deoxy Hb</source>
         <translation>Неокисл. ГГ</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="523"/>
+        <location filename="../../Train/RealtimeData.cpp" line="564"/>
         <source>Oxy Hb</source>
         <translation>Окисл. ГГ</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="526"/>
+        <location filename="../../Train/RealtimeData.cpp" line="567"/>
         <source>Left Torque Effectiveness</source>
         <translation>Эффективность крутящего момента слева</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="529"/>
+        <location filename="../../Train/RealtimeData.cpp" line="570"/>
         <source>Right Torque Effectiveness</source>
         <translation>Эффективность крутящего момента справа</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="532"/>
+        <location filename="../../Train/RealtimeData.cpp" line="573"/>
         <source>Left Pedal Smoothness</source>
         <translation>Плавность педалирования левой</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="535"/>
+        <location filename="../../Train/RealtimeData.cpp" line="576"/>
         <source>Right Pedal Smoothness</source>
         <translation>Плавность педалирования правой</translation>
     </message>
     <message>
-        <location filename="../../Train/RealtimeData.cpp" line="538"/>
+        <location filename="../../Train/RealtimeData.cpp" line="579"/>
         <source>Slope</source>
         <translation type="unfinished">Наклон</translation>
     </message>
+    <message>
+        <location filename="../../Train/RealtimeData.cpp" line="582"/>
+        <source>Lap Distance</source>
+        <translation type="unfinished">Дистанция круга</translation>
+    </message>
+    <message>
+        <location filename="../../Train/RealtimeData.cpp" line="585"/>
+        <source>Lap Distance Remaining</source>
+        <translation type="unfinished">Оставшаяся дистанция круга</translation>
+    </message>
 </context>
 <context>
     <name>RealtimePlotWindow</name>
@@ -23138,12 +24720,12 @@ yyyy</translation>
 <context>
     <name>RemotePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1596"/>
+        <location filename="../../Gui/Pages.cpp" line="2116"/>
         <source>Action</source>
         <translation>Действие</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1597"/>
+        <location filename="../../Gui/Pages.cpp" line="2117"/>
         <source>ANT+ Command</source>
         <translation>Команда ANT+</translation>
     </message>
@@ -23167,17 +24749,17 @@ yyyy</translation>
 <context>
     <name>RenameIntervalDialog</name>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="254"/>
+        <location filename="../../Core/IntervalItem.cpp" line="279"/>
         <source>Rename Intervals</source>
         <translation>Переименовать интервалы</translation>
     </message>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="272"/>
+        <location filename="../../Core/IntervalItem.cpp" line="297"/>
         <source>&amp;OK</source>
         <translation>&amp;ОК</translation>
     </message>
     <message>
-        <location filename="../../Core/IntervalItem.cpp" line="273"/>
+        <location filename="../../Core/IntervalItem.cpp" line="298"/>
         <source>&amp;Cancel</source>
         <translation>О&amp;тмена</translation>
     </message>
@@ -23246,22 +24828,22 @@ yyyy</translation>
 <context>
     <name>RideCache</name>
     <message>
-        <location filename="../../Core/RideCache.cpp" line="325"/>
+        <location filename="../../Core/RideCache.cpp" line="353"/>
         <source>Can&apos;t rename %1 to %2 in %3</source>
         <translation>Невозможно переименовать %1 в %2 в %3</translation>
     </message>
     <message>
-        <location filename="../../Core/RideCache.cpp" line="380"/>
+        <location filename="../../Core/RideCache.cpp" line="411"/>
         <source>Problem Saving Ride Cache</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Core/RideCache.cpp" line="381"/>
+        <location filename="../../Core/RideCache.cpp" line="412"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation>Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
     <message>
-        <location filename="../../Core/RideCache.cpp" line="562"/>
+        <location filename="../../Core/RideCache.cpp" line="601"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
@@ -23639,147 +25221,147 @@ Do you want to continue?</source>
 <context>
     <name>RideFile</name>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="207"/>
+        <location filename="../../FileIO/RideFile.cpp" line="220"/>
         <source>Run</source>
         <translation>Пробежка</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="215"/>
+        <location filename="../../FileIO/RideFile.cpp" line="228"/>
         <source>Swim</source>
         <translation>Заплыв</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="283"/>
+        <location filename="../../FileIO/RideFile.cpp" line="296"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="284"/>
+        <location filename="../../FileIO/RideFile.cpp" line="297"/>
         <source>Cadence</source>
         <translation>Каденс</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="285"/>
+        <location filename="../../FileIO/RideFile.cpp" line="298"/>
         <source>Heartrate</source>
         <translation>ЧСС</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="286"/>
+        <location filename="../../FileIO/RideFile.cpp" line="299"/>
         <source>Distance</source>
         <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="287"/>
+        <location filename="../../FileIO/RideFile.cpp" line="300"/>
         <source>Speed</source>
         <translation>Скорость</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="288"/>
+        <location filename="../../FileIO/RideFile.cpp" line="301"/>
         <source>Acceleration</source>
         <translation>Ускорение</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="289"/>
+        <location filename="../../FileIO/RideFile.cpp" line="302"/>
         <source>Power %1</source>
         <translation>Мощность %1</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="290"/>
+        <location filename="../../FileIO/RideFile.cpp" line="303"/>
         <source>Cadence %1</source>
         <translation>Каденс %1</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="291"/>
+        <location filename="../../FileIO/RideFile.cpp" line="304"/>
         <source>Torque %1</source>
         <translation>Крутящий момент %1</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="292"/>
+        <location filename="../../FileIO/RideFile.cpp" line="305"/>
         <source>Heartrate %1</source>
         <translation>ЧСС %1</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="293"/>
+        <location filename="../../FileIO/RideFile.cpp" line="306"/>
         <source>Torque</source>
         <translation>Крутящий момент</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="294"/>
+        <location filename="../../FileIO/RideFile.cpp" line="307"/>
         <source>Power</source>
         <translation>Мощность</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="295"/>
+        <location filename="../../FileIO/RideFile.cpp" line="308"/>
         <source>xPower</source>
         <translation>xPower</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="296"/>
+        <location filename="../../FileIO/RideFile.cpp" line="309"/>
         <source>aPower</source>
         <translation>aPower</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="297"/>
+        <location filename="../../FileIO/RideFile.cpp" line="310"/>
         <source>aTISS</source>
         <translation>aTISS</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="298"/>
+        <location filename="../../FileIO/RideFile.cpp" line="311"/>
         <source>anTISS</source>
         <translation>anTISS</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="299"/>
+        <location filename="../../FileIO/RideFile.cpp" line="312"/>
         <source>Iso Power</source>
         <translation>Нормированная мощность</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="300"/>
+        <location filename="../../FileIO/RideFile.cpp" line="313"/>
         <source>Altitude</source>
         <translation>Высота</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="301"/>
+        <location filename="../../FileIO/RideFile.cpp" line="314"/>
         <source>Longitude</source>
         <translation>Широта</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="302"/>
+        <location filename="../../FileIO/RideFile.cpp" line="315"/>
         <source>Latitude</source>
         <translation>Долгота</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="303"/>
+        <location filename="../../FileIO/RideFile.cpp" line="316"/>
         <source>Headwind</source>
         <translation>Встречный ветер</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="304"/>
+        <location filename="../../FileIO/RideFile.cpp" line="317"/>
         <source>Slope</source>
         <translation>Наклон</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="305"/>
+        <location filename="../../FileIO/RideFile.cpp" line="318"/>
         <source>Temperature</source>
         <translation>Температура</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="306"/>
+        <location filename="../../FileIO/RideFile.cpp" line="319"/>
         <source>Left/Right Balance</source>
         <translation>Левый/правый баланс</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="307"/>
+        <location filename="../../FileIO/RideFile.cpp" line="320"/>
         <source>Left Torque Efficiency</source>
         <translation>Эффективность крутящего момента левой</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="308"/>
+        <location filename="../../FileIO/RideFile.cpp" line="321"/>
         <source>Right Torque Efficiency</source>
         <translation>Эффективность крутящего момента правой</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="309"/>
+        <location filename="../../FileIO/RideFile.cpp" line="322"/>
         <source>Left Pedal Smoothness</source>
         <translation>Плавность педалирования левой</translation>
     </message>
@@ -23788,333 +25370,331 @@ Do you want to continue?</source>
         <translation type="obsolete">Плавность педалирования правой</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="311"/>
+        <location filename="../../FileIO/RideFile.cpp" line="324"/>
         <source>Left Platform Center Offset</source>
         <translation>Смещение от центра оси слева</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="312"/>
+        <location filename="../../FileIO/RideFile.cpp" line="325"/>
         <source>Right Platform Center Offset</source>
         <translation>Смещение от центра оси справа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="313"/>
+        <location filename="../../FileIO/RideFile.cpp" line="326"/>
         <source>Left Power Phase Start</source>
         <translation>Начало фазы мощности слева</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="314"/>
+        <location filename="../../FileIO/RideFile.cpp" line="327"/>
         <source>Right Power Phase Start</source>
         <translation>Начало фазы мощности справа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="315"/>
+        <location filename="../../FileIO/RideFile.cpp" line="328"/>
         <source>Left Power Phase End</source>
         <translation>Конец фазы мощности слева</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="316"/>
+        <location filename="../../FileIO/RideFile.cpp" line="329"/>
         <source>Right Power Phase End</source>
         <translation>Конец фазы мощности справа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="317"/>
+        <location filename="../../FileIO/RideFile.cpp" line="330"/>
         <source>Left Peak Power Phase Start</source>
         <translation>Начало фазы пиковой мощности слева</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="318"/>
+        <location filename="../../FileIO/RideFile.cpp" line="331"/>
         <source>Right Peak Power Phase Start</source>
         <translation>Начало фазы пиковой мощности справа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="319"/>
+        <location filename="../../FileIO/RideFile.cpp" line="332"/>
         <source>Left Peak Power Phase End</source>
         <translation>Конец фазы пиковой мощности слева</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="320"/>
+        <location filename="../../FileIO/RideFile.cpp" line="333"/>
         <source>Right Peak Power Phase End</source>
         <translation>Конец фазы пиковой мощности справа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="321"/>
-        <location filename="../../FileIO/RideFile.cpp" line="444"/>
+        <location filename="../../FileIO/RideFile.cpp" line="334"/>
+        <location filename="../../FileIO/RideFile.cpp" line="457"/>
         <source>Interval</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="322"/>
+        <location filename="../../FileIO/RideFile.cpp" line="335"/>
         <source>VAM</source>
         <translation>VAM</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="323"/>
+        <location filename="../../FileIO/RideFile.cpp" line="336"/>
         <source>Watts per Kilogram</source>
         <translation>Ватт на килограмм</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="324"/>
+        <location filename="../../FileIO/RideFile.cpp" line="337"/>
         <source>W&apos; balance</source>
         <translation>Баланс W&apos;</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="325"/>
+        <location filename="../../FileIO/RideFile.cpp" line="338"/>
         <source>SmO2</source>
         <translation>SmO₂</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="326"/>
+        <location filename="../../FileIO/RideFile.cpp" line="339"/>
         <source>THb</source>
         <translation>THb</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="327"/>
+        <location filename="../../FileIO/RideFile.cpp" line="340"/>
         <source>O2Hb</source>
         <translation>O₂Hb</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="328"/>
+        <location filename="../../FileIO/RideFile.cpp" line="341"/>
         <source>HHb</source>
         <translation>HHb</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="329"/>
+        <location filename="../../FileIO/RideFile.cpp" line="342"/>
         <source>Vertical Oscillation</source>
         <translation>Вертикальное колебание</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="330"/>
+        <location filename="../../FileIO/RideFile.cpp" line="343"/>
         <source>Run Cadence</source>
         <translation>Каденс бега</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="331"/>
+        <location filename="../../FileIO/RideFile.cpp" line="344"/>
         <source>GCT</source>
         <translation>GCT</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="332"/>
+        <location filename="../../FileIO/RideFile.cpp" line="345"/>
         <source>Gear Ratio</source>
         <translation>Передаточное отношение</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="333"/>
+        <location filename="../../FileIO/RideFile.cpp" line="346"/>
         <source>W&apos; Consumed</source>
         <translation>Израсходовано W&apos;</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="334"/>
+        <location filename="../../FileIO/RideFile.cpp" line="347"/>
         <source>Sample Index</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="335"/>
+        <location filename="../../FileIO/RideFile.cpp" line="348"/>
         <source>R-R</source>
         <translation type="unfinished">R-R</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="336"/>
-        <location filename="../../FileIO/RideFile.cpp" line="457"/>
+        <location filename="../../FileIO/RideFile.cpp" line="349"/>
+        <location filename="../../FileIO/RideFile.cpp" line="470"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="406"/>
-        <location filename="../../FileIO/RideFile.cpp" line="456"/>
+        <location filename="../../FileIO/RideFile.cpp" line="419"/>
+        <location filename="../../FileIO/RideFile.cpp" line="469"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="407"/>
+        <location filename="../../FileIO/RideFile.cpp" line="420"/>
         <source>rpm</source>
         <translation>об/мин</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="408"/>
+        <location filename="../../FileIO/RideFile.cpp" line="421"/>
         <source>rpm/s</source>
         <translation>об/с</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="409"/>
+        <location filename="../../FileIO/RideFile.cpp" line="422"/>
         <source>bpm</source>
         <translation>уд/мин</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="410"/>
+        <location filename="../../FileIO/RideFile.cpp" line="423"/>
         <source>bpm/s</source>
         <translation>уд/с</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="411"/>
+        <location filename="../../FileIO/RideFile.cpp" line="424"/>
         <source>km</source>
         <translation>км</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="411"/>
+        <location filename="../../FileIO/RideFile.cpp" line="424"/>
         <source>miles</source>
         <translation>миль</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="412"/>
-        <location filename="../../FileIO/RideFile.cpp" line="426"/>
+        <location filename="../../FileIO/RideFile.cpp" line="425"/>
+        <location filename="../../FileIO/RideFile.cpp" line="439"/>
         <source>kph</source>
         <translation>км/ч</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="412"/>
+        <location filename="../../FileIO/RideFile.cpp" line="425"/>
         <source>mph</source>
         <translation>миль/ч</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="413"/>
+        <location filename="../../FileIO/RideFile.cpp" line="426"/>
         <source>m/s/s</source>
         <translation>м/с/с</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="414"/>
+        <location filename="../../FileIO/RideFile.cpp" line="427"/>
         <source>N</source>
         <translation>Н</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="415"/>
+        <location filename="../../FileIO/RideFile.cpp" line="428"/>
         <source>N/s</source>
         <translation>Н/с</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="416"/>
-        <location filename="../../FileIO/RideFile.cpp" line="418"/>
-        <location filename="../../FileIO/RideFile.cpp" line="419"/>
-        <location filename="../../FileIO/RideFile.cpp" line="422"/>
+        <location filename="../../FileIO/RideFile.cpp" line="429"/>
+        <location filename="../../FileIO/RideFile.cpp" line="431"/>
+        <location filename="../../FileIO/RideFile.cpp" line="432"/>
+        <location filename="../../FileIO/RideFile.cpp" line="435"/>
         <source>watts</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="417"/>
+        <location filename="../../FileIO/RideFile.cpp" line="430"/>
         <source>watts/s</source>
         <translation>Вт/с</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="420"/>
-        <location filename="../../FileIO/RideFile.cpp" line="421"/>
+        <location filename="../../FileIO/RideFile.cpp" line="433"/>
+        <location filename="../../FileIO/RideFile.cpp" line="434"/>
         <source>TISS</source>
         <translation>TISS</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="423"/>
+        <location filename="../../FileIO/RideFile.cpp" line="436"/>
         <source>metres</source>
         <translation>метров</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="423"/>
+        <location filename="../../FileIO/RideFile.cpp" line="436"/>
         <source>feet</source>
         <translation>футов</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="424"/>
+        <location filename="../../FileIO/RideFile.cpp" line="437"/>
         <source>lon</source>
         <translation>долг.</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="425"/>
+        <location filename="../../FileIO/RideFile.cpp" line="438"/>
         <source>lat</source>
         <translation>шир.</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="427"/>
-        <location filename="../../FileIO/RideFile.cpp" line="429"/>
-        <location filename="../../FileIO/RideFile.cpp" line="430"/>
-        <location filename="../../FileIO/RideFile.cpp" line="431"/>
-        <location filename="../../FileIO/RideFile.cpp" line="432"/>
-        <location filename="../../FileIO/RideFile.cpp" line="433"/>
-        <location filename="../../FileIO/RideFile.cpp" line="448"/>
+        <location filename="../../FileIO/RideFile.cpp" line="440"/>
+        <location filename="../../FileIO/RideFile.cpp" line="442"/>
+        <location filename="../../FileIO/RideFile.cpp" line="443"/>
+        <location filename="../../FileIO/RideFile.cpp" line="444"/>
+        <location filename="../../FileIO/RideFile.cpp" line="445"/>
+        <location filename="../../FileIO/RideFile.cpp" line="446"/>
+        <location filename="../../FileIO/RideFile.cpp" line="461"/>
         <source>%</source>
         <translation>%</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="428"/>
+        <location filename="../../FileIO/RideFile.cpp" line="441"/>
         <source>°C</source>
         <translation>°C</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="436"/>
-        <location filename="../../FileIO/RideFile.cpp" line="437"/>
-        <location filename="../../FileIO/RideFile.cpp" line="438"/>
-        <location filename="../../FileIO/RideFile.cpp" line="439"/>
-        <location filename="../../FileIO/RideFile.cpp" line="440"/>
-        <location filename="../../FileIO/RideFile.cpp" line="441"/>
-        <location filename="../../FileIO/RideFile.cpp" line="442"/>
-        <location filename="../../FileIO/RideFile.cpp" line="443"/>
+        <location filename="../../FileIO/RideFile.cpp" line="449"/>
+        <location filename="../../FileIO/RideFile.cpp" line="450"/>
+        <location filename="../../FileIO/RideFile.cpp" line="451"/>
+        <location filename="../../FileIO/RideFile.cpp" line="452"/>
+        <location filename="../../FileIO/RideFile.cpp" line="453"/>
+        <location filename="../../FileIO/RideFile.cpp" line="454"/>
+        <location filename="../../FileIO/RideFile.cpp" line="455"/>
+        <location filename="../../FileIO/RideFile.cpp" line="456"/>
         <source>°</source>
         <translation>°</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="2091"/>
         <source>Invalid File Name</source>
-        <translation>Неправильное имя файла</translation>
+        <translation type="vanished">Неправильное имя файла</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="434"/>
-        <location filename="../../FileIO/RideFile.cpp" line="435"/>
+        <location filename="../../FileIO/RideFile.cpp" line="447"/>
+        <location filename="../../FileIO/RideFile.cpp" line="448"/>
         <source>mm</source>
         <translation>мм</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="310"/>
+        <location filename="../../FileIO/RideFile.cpp" line="323"/>
         <source>Right Pedal Smoothness</source>
         <translation>Плавность педалирования правой</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="445"/>
+        <location filename="../../FileIO/RideFile.cpp" line="458"/>
         <source>meters per hour</source>
         <translation>метров в час</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="446"/>
+        <location filename="../../FileIO/RideFile.cpp" line="459"/>
         <source>watts/kg</source>
         <translation>Вт/кг</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="447"/>
+        <location filename="../../FileIO/RideFile.cpp" line="460"/>
         <source>joules</source>
         <translation>джоулей</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="449"/>
+        <location filename="../../FileIO/RideFile.cpp" line="462"/>
         <source>g/dL</source>
         <translation>г/дл</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="452"/>
+        <location filename="../../FileIO/RideFile.cpp" line="465"/>
         <source>spm</source>
         <translation>шаг/мин</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="453"/>
+        <location filename="../../FileIO/RideFile.cpp" line="466"/>
         <source>cm</source>
         <translation>см</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="454"/>
+        <location filename="../../FileIO/RideFile.cpp" line="467"/>
         <source>ms</source>
         <translation>мс</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="455"/>
+        <location filename="../../FileIO/RideFile.cpp" line="468"/>
         <source>ratio</source>
         <translation>соотношение</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="2092"/>
         <source>Invalid date/time in filename:
 %1
 Skipping file...</source>
-        <translation>Неверная дата/время в файле:
+        <translation type="vanished">Неверная дата/время в файле:
 %1
 Пропускаем файл...</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="2209"/>
+        <location filename="../../FileIO/RideFile.cpp" line="2343"/>
         <source>Wheelsize</source>
         <translation>Диаметр колёс</translation>
     </message>
@@ -24122,22 +25702,22 @@ Skipping file...</source>
 <context>
     <name>RideFileInterval</name>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="529"/>
+        <location filename="../../FileIO/RideFile.cpp" line="542"/>
         <source>ALL</source>
         <translation>Все</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="530"/>
+        <location filename="../../FileIO/RideFile.cpp" line="543"/>
         <source>DEVICE</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="531"/>
+        <location filename="../../FileIO/RideFile.cpp" line="544"/>
         <source>USER</source>
         <translation>Пользовательские</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="533"/>
+        <location filename="../../FileIO/RideFile.cpp" line="546"/>
         <source>PEAK POWER</source>
         <translation>Пиковая мощность</translation>
     </message>
@@ -24146,7 +25726,7 @@ Skipping file...</source>
         <translation type="obsolete">СПРИНТ</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="534"/>
+        <location filename="../../FileIO/RideFile.cpp" line="547"/>
         <source>SEGMENTS</source>
         <translation>Участки</translation>
     </message>
@@ -24155,12 +25735,12 @@ Skipping file...</source>
         <translation type="obsolete">ПИКОВАЯ ЧСС</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="535"/>
+        <location filename="../../FileIO/RideFile.cpp" line="548"/>
         <source>CLIMBING</source>
         <translation>Набор высоты</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="536"/>
+        <location filename="../../FileIO/RideFile.cpp" line="549"/>
         <source>EFFORTS</source>
         <translation>Объём работы</translation>
     </message>
@@ -24169,72 +25749,72 @@ Skipping file...</source>
         <translation type="obsolete">ИЗНУРЕНИЕ</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="532"/>
+        <location filename="../../FileIO/RideFile.cpp" line="545"/>
         <source>PEAK PACE</source>
         <translation>Пиковый темп</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="543"/>
+        <location filename="../../FileIO/RideFile.cpp" line="556"/>
         <source>The entire activity</source>
         <translation>Во всей тренировке</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="544"/>
+        <location filename="../../FileIO/RideFile.cpp" line="557"/>
         <source>Device specific intervals</source>
         <translation>Специфичные для устройства интервалы</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="545"/>
+        <location filename="../../FileIO/RideFile.cpp" line="558"/>
         <source>User defined laps or marked intervals</source>
         <translation>Указанные пользователем круги или отмеченные интервалы</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="546"/>
+        <location filename="../../FileIO/RideFile.cpp" line="559"/>
         <source>Peak pace for running and swimming</source>
         <translation>Пиковый темп в беге или плавании</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="547"/>
+        <location filename="../../FileIO/RideFile.cpp" line="560"/>
         <source>Peak powers for cycling 1s thru 1hr</source>
         <translation>Пиковые мощности с первой секунды до часа</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="548"/>
+        <location filename="../../FileIO/RideFile.cpp" line="561"/>
         <source>Route segments using GPS data</source>
         <translation>Участки маршрута через данные GPS</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="549"/>
+        <location filename="../../FileIO/RideFile.cpp" line="562"/>
         <source>Ascents for hills and mountains</source>
         <translation>Подъёмы на холмы и горы</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="550"/>
+        <location filename="../../FileIO/RideFile.cpp" line="563"/>
         <source>Sustained efforts and matches using power</source>
         <translation>Длительные усилия и совпадения по мощности</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="3017"/>
+        <location filename="../../FileIO/RideFile.cpp" line="3170"/>
         <source>Peak</source>
         <translation>Пик</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="3017"/>
+        <location filename="../../FileIO/RideFile.cpp" line="3170"/>
         <source>Find</source>
         <translation>Найти</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="3024"/>
+        <location filename="../../FileIO/RideFile.cpp" line="3177"/>
         <source>Match</source>
         <translation>Совпадение</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="3030"/>
+        <location filename="../../FileIO/RideFile.cpp" line="3183"/>
         <source>Climb</source>
         <translation>Набор высоты</translation>
     </message>
     <message>
-        <location filename="../../FileIO/RideFile.cpp" line="3036"/>
+        <location filename="../../FileIO/RideFile.cpp" line="3189"/>
         <source>Best</source>
         <translation>Лучшие</translation>
     </message>
@@ -24415,104 +25995,104 @@ Skipping file...</source>
 <context>
     <name>RideImportWizard</name>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="249"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="264"/>
         <source>Select Date...</source>
         <translation>Выберите дату...</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="250"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="265"/>
         <source>Today</source>
         <translation>Сегодня</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="251"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="266"/>
         <source>Last Monday</source>
         <translation>Прошлый понедельник</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="252"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="267"/>
         <source>Last Tuesday</source>
         <translation>Прошлый вторник</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="253"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="268"/>
         <source>Last Wednesday</source>
         <translation>Прошлая среда</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="254"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="269"/>
         <source>Last Thursday</source>
         <translation>Прошлый четверг</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="255"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="270"/>
         <source>Last Friday</source>
         <translation>Прошлая пятница</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="256"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="271"/>
         <source>Last Saturday</source>
         <translation>Прошлая суббота</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="257"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="272"/>
         <source>Last Sunday</source>
         <translation>Прошлое воскресенье</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="258"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="273"/>
         <source>Choose Date</source>
         <translation>Выберите дату</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="259"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="274"/>
         <source>Cancel</source>
         <translation>Отменить</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="260"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="902"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="925"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="275"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="963"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="986"/>
         <source>Abort</source>
         <translation>Прервать</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="282"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="297"/>
         <source>Filename</source>
         <translation>Имя файла</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="286"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="301"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="290"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="305"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="294"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="309"/>
         <source>Duration</source>
         <translation>Длительность</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="298"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="313"/>
         <source>Distance</source>
         <translation>Дистанция</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="302"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="317"/>
         <source>Import Status</source>
         <translation>Статус импортирования</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="442"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="486"/>
         <source>Step 1 of 4: Check file permissions</source>
         <translation>Шаг 1 из 4: Проверьте права доступа к файлам</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="447"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="491"/>
         <source>Error - File does not exist.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -24521,22 +26101,32 @@ Skipping file...</source>
         <translation type="vanished">Ошибка - Файл не существует.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="448"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="492"/>
         <source>Error - Not a file.</source>
         <translation>Ошибка - Это не файл.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="449"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="493"/>
         <source>Error - File is not readable.</source>
         <translation>Ошибка - файл недоступен для чтения.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="460"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="494"/>
+        <source>Error - Opendata summary.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/RideImportWizard.cpp" line="506"/>
+        <source>undefined</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Gui/RideImportWizard.cpp" line="521"/>
         <source>Queued</source>
         <translation>В очереди</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="463"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="524"/>
         <source>Error - Unknown file type</source>
         <translation>Ошибка - неизвестный тип файла</translation>
     </message>
@@ -24545,47 +26135,47 @@ Skipping file...</source>
         <translation type="vanished">Ошибка - недопустимый файл</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="476"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="537"/>
         <source>Step 2 of 4: Validating Files</source>
         <translation>Шаг 2 из 4: Проверка файлов</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="481"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="670"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="748"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="945"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1076"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="542"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="732"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="810"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1006"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1138"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="486"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="547"/>
         <source>Parsing...</source>
         <translation>Обработка...</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="594"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="656"/>
         <source>Validated</source>
         <translation>Проверено</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="596"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="658"/>
         <source>Warning - </source>
         <translation>Предупреждение - </translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="596"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="649"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="658"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="711"/>
         <source>;</source>
         <translation>;</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="681"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="743"/>
         <source>Step 3 of 4: %1 ride(s) are missing the date and time.</source>
         <translation>Шаг 3 из 4: тренировок без даты и времени: %1.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="683"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="745"/>
         <source>Step 3 of 4: Change Date/Time or Save to continue.</source>
         <translation>Шаг 3 из 4: Измените время и дату или сохраните их что бы продолжить.</translation>
     </message>
@@ -24594,42 +26184,42 @@ Skipping file...</source>
         <translation type="vanished">dd MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="726"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="788"/>
         <source>No files for automatic import selected.</source>
         <translation>Не выбраны файлы для автоимпорта.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="824"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="886"/>
         <source>More than 24hrs of activities to fit into a day</source>
         <translation>Больше 24 часов тренировок в течении одного дня</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="972"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1033"/>
         <source>Error - Activity file exists</source>
         <translation>Ошибка: эта тренировка уже есть</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="995"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1056"/>
         <source>Error - copy of %1 to import directory failed</source>
         <translation>Ошибка: не удалось скопировать %1 в каталог импорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1051"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1113"/>
         <source>Error - Moving %1 to activities folder</source>
         <translation>Ошибка - Перемещение %1 в каталог тренировок</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1055"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1117"/>
         <source>Error - .JSON creation failed</source>
         <translation>Ошибка: не удалось создать файл .JSON</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1058"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1120"/>
         <source>Error - Import of activitiy file failed</source>
         <translation>Ошибка: не удалось импортировать файл с записью тренировки</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="649"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="711"/>
         <source>Error - </source>
         <translation>Ошибка - </translation>
     </message>
@@ -24638,57 +26228,57 @@ Skipping file...</source>
         <translation type="vanished"> </translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="91"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="102"/>
         <source>Directory</source>
         <translation>Каталог</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="95"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="106"/>
         <source>Import Rule</source>
         <translation>Правило импорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="99"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="110"/>
         <source>Directory Status</source>
         <translation>Статус каталога</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="137"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="148"/>
         <source>No import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="144"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="155"/>
         <source>No directory</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="149"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="160"/>
         <source>Directory not available</source>
         <translation>Каталог недоступен</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="153"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="164"/>
         <source>Directory not readable</source>
         <translation>Каталог не доступен для чтения</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="211"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="222"/>
         <source>%1 files for import selected</source>
         <translation>Выбрано файлов для импорта: %1</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="213"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="224"/>
         <source>No files in requested time range</source>
         <translation>Нет файлов в запрошенном периоде времени</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="216"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="227"/>
         <source>No activity files found</source>
         <translation>Файлы тренировок не обнаружены</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="280"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="295"/>
         <source>Import Files</source>
         <translation>Импортировать файлы</translation>
     </message>
@@ -24697,59 +26287,64 @@ Skipping file...</source>
         <translation type="vanished">Шаг 3 из 4: Подтверждение даты и времени</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="695"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="757"/>
         <source>Save</source>
         <translation>Сохранить</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="824"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="886"/>
         <source>Invalid Selection</source>
         <translation>Неправильный выбор</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="914"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="975"/>
         <source>Auto Import</source>
         <translation>Автоимпорт</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="914"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="975"/>
         <source>Automatic import from defined directories is completed.</source>
         <translation>Автоматический импорт из указанных каталогов завершён.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="923"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="984"/>
         <source>Step 4 of 4: Save to Library</source>
         <translation>Шаг 4 из 4: Сохранить в библиотеку</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="947"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1008"/>
         <source>Saving...</source>
         <translation>Сохранение...</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="978"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1039"/>
         <source>Error - Activity file with same start date/time exists</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1009"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1089"/>
+        <source>Processing...</source>
+        <translation type="unfinished">Выполняется обработка...</translation>
+    </message>
+    <message>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1093"/>
         <source>Saving file...</source>
         <translation>Сохранение файла...</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1047"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1109"/>
         <source>File Saved</source>
         <translation>Файл сохранен</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1081"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1143"/>
         <source>Import Complete. %1 of %2 successful.</source>
         <translation>Импорт завершен. Успешно добавлено тренировок: %1 из %2.</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideImportWizard.cpp" line="727"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="909"/>
-        <location filename="../../Gui/RideImportWizard.cpp" line="1086"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="789"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="970"/>
+        <location filename="../../Gui/RideImportWizard.cpp" line="1148"/>
         <source>Finish</source>
         <translation>Завершить</translation>
     </message>
@@ -24757,128 +26352,128 @@ Skipping file...</source>
 <context>
     <name>RideItem</name>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="866"/>
+        <location filename="../../Core/RideItem.cpp" line="889"/>
         <source>Entire Activity</source>
         <translation>Вся тренировка</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
         <source>1 second</source>
         <translation>1 секунда</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
         <source>5 seconds</source>
         <translation>5 секунд</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
-        <location filename="../../Core/RideItem.cpp" line="959"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
+        <location filename="../../Core/RideItem.cpp" line="987"/>
         <source>10 seconds</source>
         <translation>10 секунд</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
-        <location filename="../../Core/RideItem.cpp" line="959"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
+        <location filename="../../Core/RideItem.cpp" line="987"/>
         <source>15 seconds</source>
         <translation>15 секунд</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
-        <location filename="../../Core/RideItem.cpp" line="959"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
+        <location filename="../../Core/RideItem.cpp" line="987"/>
         <source>20 seconds</source>
         <translation>20 секунд</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="926"/>
-        <location filename="../../Core/RideItem.cpp" line="959"/>
+        <location filename="../../Core/RideItem.cpp" line="953"/>
+        <location filename="../../Core/RideItem.cpp" line="987"/>
         <source>30 seconds</source>
         <translation>30 секунд</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>1 minute</source>
         <translation>1 минута</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>5 minutes</source>
         <translation>5 минут</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>10 minutes</source>
         <translation>10 минут</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>20 minutes</source>
         <translation>20 минут</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>30 minutes</source>
         <translation>30 минут</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="927"/>
-        <location filename="../../Core/RideItem.cpp" line="960"/>
+        <location filename="../../Core/RideItem.cpp" line="954"/>
+        <location filename="../../Core/RideItem.cpp" line="988"/>
         <source>45 minutes</source>
         <translation>45 минут</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="928"/>
-        <location filename="../../Core/RideItem.cpp" line="961"/>
+        <location filename="../../Core/RideItem.cpp" line="955"/>
+        <location filename="../../Core/RideItem.cpp" line="989"/>
         <source>1 hour</source>
         <translation>1 час</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="939"/>
+        <location filename="../../Core/RideItem.cpp" line="966"/>
         <source>%1 (%2 watts)</source>
         <translation>%1 (%2 Вт)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="973"/>
+        <location filename="../../Core/RideItem.cpp" line="1001"/>
         <source>%1 (%2 %3)</source>
         <translation>%1 (%2 %3)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1257"/>
+        <location filename="../../Core/RideItem.cpp" line="1286"/>
         <source>L%3 TTE of %1  (%2 watts)</source>
         <translation>L%3 TTE за %1 (%2 Вт)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1263"/>
+        <location filename="../../Core/RideItem.cpp" line="1292"/>
         <source>L%4 %3% EFFORT of %1  (%2 watts)</source>
         <translation>L%4 %3% объём работы за %1 (%2 Вт)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1284"/>
+        <location filename="../../Core/RideItem.cpp" line="1313"/>
         <source>L%3 SPRINT of %1 secs (%2 watts)</source>
         <translation>L%3 спринт длительностью %1 с (%2 Вт)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1393"/>
+        <location filename="../../Core/RideItem.cpp" line="1422"/>
         <source>Climb %1</source>
         <translation>Набор высоты %1</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1461"/>
+        <location filename="../../Core/RideItem.cpp" line="1493"/>
         <source>L%1 %5 %2 (%3w %4 kJ)</source>
         <translation>L%1 %5 %2 (%3 Вт %4 кДж)</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1466"/>
+        <location filename="../../Core/RideItem.cpp" line="1498"/>
         <source>TE MATCH</source>
         <translation>совпадение с TE</translation>
     </message>
     <message>
-        <location filename="../../Core/RideItem.cpp" line="1466"/>
+        <location filename="../../Core/RideItem.cpp" line="1498"/>
         <source>MATCH</source>
         <translation>совпадение</translation>
     </message>
@@ -24886,87 +26481,98 @@ Skipping file...</source>
 <context>
     <name>RideMapWindow</name>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="64"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="66"/>
         <source>OpenStreetMap</source>
         <translation>OpenStreetMap</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="65"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="67"/>
         <source>Google</source>
         <translation>Гугл</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="66"/>
         <source>Bing</source>
-        <translation>Бинг</translation>
+        <translation type="vanished">Бинг</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="75"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="76"/>
         <source>Map</source>
         <translation>Карта</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="76"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="77"/>
         <source>Show Markers</source>
         <translation>Показывать маркеры</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="77"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="78"/>
         <source>Show Full Plot</source>
         <translation>Показывать полный график</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="78"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="79"/>
         <source>Show Intervals Overlay</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Подсвечивать интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="81"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="82"/>
         <source>Open Street Map - Custom Tile Server settings</source>
         <translation>Open Street Map: настройки сервера карты</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="83"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="84"/>
         <source>Tile server</source>
         <translation>Сервер карт</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="84"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="85"/>
         <source>Tile server URL</source>
         <translation>URL сервера тайлов</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="88"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="89"/>
         <source>OpenStreetMap (default)</source>
         <translation>OpenStreetMap (по умолчанию)</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="89"/>
-        <source>OpenCycleMap</source>
-        <translation>Велосипедная карта</translation>
+        <location filename="../../Charts/RideMapWindow.cpp" line="90"/>
+        <source>Custom Tile Server A</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../Charts/RideMapWindow.cpp" line="91"/>
-        <source>Mapquest</source>
-        <translation>карта Mapques</translation>
+        <source>Custom Tile Server B</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../../Charts/RideMapWindow.cpp" line="92"/>
-        <source>Custom</source>
-        <translation>На заказ</translation>
+        <source>Custom Tile Server C</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="152"/>
+        <source>OpenCycleMap</source>
+        <translation type="vanished">Велосипедная карта</translation>
+    </message>
+    <message>
+        <source>Mapquest</source>
+        <translation type="vanished">карта Mapques</translation>
+    </message>
+    <message>
+        <source>Custom</source>
+        <translation type="vanished">На заказ</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/RideMapWindow.cpp" line="154"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="314"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="323"/>
         <source>Route</source>
         <translation>Маршрут</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideMapWindow.cpp" line="378"/>
+        <location filename="../../Charts/RideMapWindow.cpp" line="387"/>
         <source>No GPS Data Present</source>
         <translation>Нет данных GPS</translation>
     </message>
@@ -24974,12 +26580,12 @@ Skipping file...</source>
 <context>
     <name>RideMetadata</name>
     <message>
-        <location filename="../../Metrics/RideMetadata.cpp" line="1225"/>
+        <location filename="../../Metrics/RideMetadata.cpp" line="1244"/>
         <source>Problem Saving Meta Data</source>
         <translation>Ошибка при сохранении метаданных</translation>
     </message>
     <message>
-        <location filename="../../Metrics/RideMetadata.cpp" line="1226"/>
+        <location filename="../../Metrics/RideMetadata.cpp" line="1245"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation>Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
@@ -24988,57 +26594,57 @@ Skipping file...</source>
     <name>RideNavigator</name>
     <message>
         <location filename="../../Gui/RideNavigator.cpp" line="42"/>
-        <location filename="../../Gui/RideNavigator.cpp" line="244"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="245"/>
         <source>*|Workout Code|Date|</source>
         <translation>*|Название тренировки|Дата|</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="256"/>
         <location filename="../../Gui/RideNavigator.cpp" line="257"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="258"/>
         <source>File</source>
         <translation>Файл</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="258"/>
         <location filename="../../Gui/RideNavigator.cpp" line="259"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="260"/>
         <source>Last updated</source>
         <translation>Последнее обновление</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="260"/>
         <location filename="../../Gui/RideNavigator.cpp" line="261"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="262"/>
         <source>Date</source>
         <translation>Дата</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="262"/>
         <location filename="../../Gui/RideNavigator.cpp" line="263"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="264"/>
         <source>Time</source>
         <translation>Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="264"/>
         <location filename="../../Gui/RideNavigator.cpp" line="265"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="266"/>
         <source>Config Checksum</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="528"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="529"/>
         <source>Remove Column</source>
         <translation>Удалить столбец</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="534"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="535"/>
         <source>Column Chooser</source>
         <translation>Выбор столбцов</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="539"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="540"/>
         <source>Do Not Show in Groups</source>
         <translation>Не показывать в группах</translation>
     </message>
     <message>
-        <location filename="../../Gui/RideNavigator.cpp" line="539"/>
+        <location filename="../../Gui/RideNavigator.cpp" line="540"/>
         <source>Show In Groups</source>
         <translation>Показывать в группах</translation>
     </message>
@@ -25046,7 +26652,7 @@ Skipping file...</source>
 <context>
     <name>RideSummaryWindow</name>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="481"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="453"/>
         <source>&lt;p&gt;Couldn&apos;t read file &quot;</source>
         <translation>&lt;p&gt;Невозможно прочитать файл &quot;</translation>
     </message>
@@ -25061,125 +26667,140 @@ Skipping file...</source>
         <translation>Диапазон дат</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="336"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="308"/>
         <source>%2 on %1  vs  %4 on %3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="337"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="339"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="343"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="309"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="311"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="315"/>
         <source>dd MMM yy</source>
         <translation>dd MMM yy</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="342"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="314"/>
         <source>%2 on %1  vs  %3 others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="366"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="338"/>
         <source>%1  vs  %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="371"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="343"/>
         <source>%1  vs  %2 others</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="402"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="374"/>
         <source>dddd MMMM d, yyyy, hh:mm</source>
         <translation>d MMMM yyyy, dddd, hh:mm</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="407"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="409"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="379"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="381"/>
         <source>dddd MMMM d yyyy</source>
         <translation>d MMMM yyyy, dddd</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="498"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="470"/>
         <source>Device Type: </source>
         <translation>Устройство: </translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="501"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1663"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="473"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1621"/>
         <source>Totals</source>
         <translation>Итого</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="501"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1663"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="473"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1621"/>
         <source>Averages</source>
         <translation>Средние значения</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="501"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1663"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="473"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1621"/>
         <source>Maximums</source>
         <translation>Максимальные значения</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="219"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="856"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="658"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="663"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="668"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="673"/>
+        <source>&lt;tr&gt;&lt;td&gt;%3&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;&lt;font color=&quot;%2&quot;&gt;%1&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="737"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="739"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="741"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="743"/>
+        <source>&lt;tr&gt;&lt;td&gt;%4&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;%3 (%1 - %2)&lt;/td&gt;&lt;/tr&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="821"/>
         <source>&lt;h3&gt;Model&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Модель&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="860"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="825"/>
         <source>W&apos;</source>
         <translation>W&apos;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="870"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="835"/>
         <source>CP</source>
         <translation>CP</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="872"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="894"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="837"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="859"/>
         <source>watts</source>
         <translation>Вт</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="875"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="897"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="840"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="862"/>
         <source>w/kg</source>
         <translation>Вт/кг</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="883"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="848"/>
         <source>FTP (watts)</source>
         <translation>FTP (Вт)</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="886"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="851"/>
         <source>FTP (w/kg)</source>
         <translation>FTP (Вт/кг)</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="892"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="857"/>
         <source>P-max</source>
         <translation>P макс</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1135"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1100"/>
         <source>Interval Name</source>
         <translation>Интервал</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1248"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1348"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1447"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1213"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1313"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1412"/>
         <source>%1 of %2</source>
         <translation>%1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1323"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1422"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1521"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1288"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1387"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1486"/>
         <source>dd MMM yyyy</source>
         <translation>dd MMM yyyy</translation>
     </message>
@@ -25188,188 +26809,147 @@ Skipping file...</source>
         <translation type="vanished">&lt;br&gt;FTP, BikeStress, IsoPower и IF зарегистрированные торговые марки Peaksware LLC&lt;/center&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1617"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1621"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1626"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1631"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1578"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1582"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1587"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1592"/>
         <source>N/A</source>
         <translation>—</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1663"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1621"/>
         <source>Metrics*</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="793"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1833"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2200"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="769"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1791"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2158"/>
         <source>^(Average|Max) </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="229"/>
         <source>&lt;h3&gt;Modeling&lt;br&gt;%1&lt;/h3&gt;</source>
-        <translation>&lt;h3&gt;Моделирование&lt;br&gt;%1&lt;/h3&gt;</translation>
+        <translation type="vanished">&lt;h3&gt;Моделирование&lt;br&gt;%1&lt;/h3&gt;</translation>
     </message>
     <message>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="319"/>
         <location filename="../../Charts/RideSummaryWindow.cpp" line="347"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="375"/>
         <source>Compare</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="389"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="361"/>
         <source>Summary</source>
         <translation>Сводка</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="501"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="473"/>
         <source>Metrics</source>
         <translation>Показатели</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="686"/>
-        <source>&lt;tr&gt;&lt;td&gt;CTL:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;&lt;font color=&quot;%2&quot;&gt;%1&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="690"/>
-        <source>&lt;tr&gt;&lt;td&gt;ATL:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;&lt;font color=&quot;%2&quot;&gt;%1&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="694"/>
-        <source>&lt;tr&gt;&lt;td&gt;TSB:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;&lt;font color=&quot;%2&quot;&gt;%1&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="698"/>
-        <source>&lt;tr&gt;&lt;td&gt;RR:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;&lt;font color=&quot;%2&quot;&gt;%1&lt;/font&gt;&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="761"/>
-        <source>&lt;tr&gt;&lt;td&gt;CTL:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;%3 (%1 - %2)&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="763"/>
-        <source>&lt;tr&gt;&lt;td&gt;ATL:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;%3 (%1 - %2)&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="765"/>
-        <source>&lt;tr&gt;&lt;td&gt;TSB:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;%3 (%1 - %2)&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="767"/>
-        <source>&lt;tr&gt;&lt;td&gt;RR:&lt;/td&gt;&lt;td align=&quot;right&quot;&gt;%3 (%1 - %2)&lt;/td&gt;&lt;/tr&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="796"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1140"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1287"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1295"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1387"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1395"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1486"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1494"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1828"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1871"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1891"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2195"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2233"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2253"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="772"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1105"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1252"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1260"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1352"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1360"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1451"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1459"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1786"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1829"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1849"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2153"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2191"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2211"/>
         <source>seconds</source>
         <translation>секунд</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="906"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="871"/>
         <source>&lt;h3&gt;Athlete Bests&lt;/h3&gt;
 </source>
         <translation>&lt;h3&gt;Лучшие показатели&lt;/h3&gt;
 </translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="936"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="901"/>
         <source>d MMM yyyy</source>
         <translation>d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="991"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2079"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2510"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="956"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2037"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2468"/>
         <source>&lt;h3&gt;Pace Zones&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Зоны темпа&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1040"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1932"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2296"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1005"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1890"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2254"/>
         <source>&lt;h3&gt;Power Zones&lt;/h3&gt;</source>
         <translation>&lt;h2&gt;Зоны мощности&lt;/h2&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1063"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2353"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1028"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2311"/>
         <source>&lt;h3&gt;W&apos;bal Zones&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Зоны W&apos;bal&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1103"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1068"/>
         <source>&lt;h3&gt;Heart Rate Zones&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Зоны ЧСС&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1249"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1255"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1214"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1220"/>
         <source> ride</source>
         <translation> заезд</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1249"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1255"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1214"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1220"/>
         <source> rides</source>
         <translation> заездов</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1264"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1364"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1463"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1229"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1329"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1428"/>
         <source>&lt;td align=&quot;center&quot;&gt;Date&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Дата&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1281"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1381"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1480"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1246"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1346"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1445"/>
         <source>&lt;td align=&quot;center&quot;&gt;&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1349"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1355"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1314"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1320"/>
         <source> run</source>
         <translation> забег</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1349"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1355"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1314"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1320"/>
         <source> runs</source>
         <translation> забегов</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1448"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1454"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1413"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1419"/>
         <source> swim</source>
         <translation> заплыв</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1448"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1454"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1413"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1419"/>
         <source> swims</source>
         <translation> заплывов</translation>
     </message>
@@ -25382,18 +26962,18 @@ Skipping file...</source>
         <translation type="vanished">&lt;br&gt;BikeScore - торговая марка Dr. Philip Friere Skiba, PhysFarm Training Systems LLC</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2005"/>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="2437"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1963"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="2395"/>
         <source>&lt;h3&gt;Heartrate Zones&lt;/h3&gt;</source>
         <translation>&lt;h3&gt;Зоны ЧСС&lt;/h3&gt;</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1126"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1091"/>
         <source>Intervals</source>
         <translation>Интервалы</translation>
     </message>
     <message>
-        <location filename="../../Charts/RideSummaryWindow.cpp" line="1546"/>
+        <location filename="../../Charts/RideSummaryWindow.cpp" line="1511"/>
         <source>&lt;p&gt;&lt;h2&gt;Errors reading file:&lt;/h2&gt;&lt;ul&gt;</source>
         <translation>&lt;p&gt;&lt;h2&gt;Ошибки при чтении файла:&lt;/h2&gt;&lt;ul&gt;</translation>
     </message>
@@ -25416,12 +26996,12 @@ Skipping file...</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/RideWithGPS.h" line="33"/>
+        <location filename="../../Cloud/RideWithGPS.h" line="34"/>
         <source>RideWithGPS</source>
         <translation type="unfinished">RideWithGPS</translation>
     </message>
     <message>
-        <location filename="../../Cloud/RideWithGPS.h" line="34"/>
+        <location filename="../../Cloud/RideWithGPS.h" line="35"/>
         <source>Upload rides and analyse them using Google Maps.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -25436,44 +27016,8 @@ Skipping file...</source>
 <context>
     <name>RideWithGpsUploader</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="748"/>
         <source>Ride With GPS</source>
-        <translation type="unfinished">Ride With GPS</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="760"/>
-        <source>no credentials set for RideWithGps. Please check Settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="777"/>
-        <source>Error uploading to RideWithGPS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="781"/>
-        <source>Successfully uploaded to RideWithGPS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="788"/>
-        <source>Upload...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="877"/>
-        <source>Upload... Sending to RideWithGPS</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="887"/>
-        <source>Upload to RideWithGPS finished.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="918"/>
-        <source> Error from RideWithGPS: </source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Ride With GPS</translation>
     </message>
 </context>
 <context>
@@ -25582,108 +27126,99 @@ Skipping file...</source>
         <translation type="vanished">Средний LTS (дни)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="865"/>
-        <location filename="../../Gui/Pages.cpp" line="1099"/>
+        <location filename="../../Gui/Pages.cpp" line="954"/>
+        <location filename="../../Gui/Pages.cpp" line="1219"/>
         <source> kg</source>
-        <translation type="unfinished"></translation>
+        <translation> кг</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="865"/>
-        <location filename="../../Gui/Pages.cpp" line="1099"/>
+        <location filename="../../Gui/Pages.cpp" line="954"/>
+        <location filename="../../Gui/Pages.cpp" line="1219"/>
         <source> lb</source>
-        <translation type="unfinished"></translation>
+        <translation> фунт</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="875"/>
         <source>From Date</source>
-        <translation type="unfinished">Дата замера</translation>
+        <translation type="obsolete">Дата замера</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="881"/>
         <source>Weight</source>
-        <translation type="unfinished">Вес</translation>
+        <translation type="obsolete">Вес</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="890"/>
-        <source>Fat</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Gui/Pages.cpp" line="966"/>
+        <source>Default Weight</source>
+        <translation>Вес по умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="899"/>
-        <source>Muscle</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Gui/Pages.cpp" line="989"/>
+        <source>Time dependent measurements</source>
+        <translation>Измерения, зависящие от времени</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="908"/>
-        <source>Bones</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Gui/Pages.cpp" line="992"/>
+        <source>From Date - Time</source>
+        <translation>Дата и время измерения</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="917"/>
-        <source>Lean</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/Pages.cpp" line="926"/>
-        <source>Fat%</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Gui/Pages.cpp" line="935"/>
+        <location filename="../../Gui/Pages.cpp" line="1052"/>
         <source>Comment</source>
-        <translation type="unfinished">Комментарий</translation>
+        <translation>Комментарий</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="970"/>
-        <location filename="../../Gui/Pages.cpp" line="979"/>
+        <location filename="../../Gui/Pages.cpp" line="1085"/>
+        <location filename="../../Gui/Pages.cpp" line="1093"/>
         <source>Update</source>
-        <translation type="unfinished">Обновить</translation>
+        <translation>Обновить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="972"/>
+        <location filename="../../Gui/Pages.cpp" line="1087"/>
         <source>+</source>
-        <translation type="unfinished">+</translation>
+        <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="973"/>
+        <location filename="../../Gui/Pages.cpp" line="1088"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="980"/>
+        <location filename="../../Gui/Pages.cpp" line="1094"/>
         <source>Add</source>
         <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="981"/>
+        <location filename="../../Gui/Pages.cpp" line="1095"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="996"/>
+        <location filename="../../Gui/Pages.cpp" line="1145"/>
+        <location filename="../../Gui/Pages.cpp" line="1277"/>
+        <source>MMM d, yyyy - hh:mm:ss</source>
+        <translation type="unfinished">d MMM yyyy - hh:mm:ss</translation>
+    </message>
+    <message>
         <source>Time</source>
-        <translation type="unfinished">Время</translation>
+        <translation type="obsolete">Время</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1012"/>
+        <location filename="../../Gui/Pages.cpp" line="1124"/>
         <source>Source</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Источник</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1014"/>
+        <location filename="../../Gui/Pages.cpp" line="1126"/>
         <source>Original Source</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Оригинальный источник</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1033"/>
-        <location filename="../../Gui/Pages.cpp" line="1157"/>
         <source>MMM d, yyyy</source>
-        <translation type="unfinished">d MMM yyyy</translation>
+        <translation type="obsolete">d MMM yyyy</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1198"/>
+        <location filename="../../Gui/Pages.cpp" line="1316"/>
         <source>Manual entry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Ручной ввод</translation>
     </message>
 </context>
 <context>
@@ -25693,6 +27228,11 @@ Skipping file...</source>
         <source>&quot;%1&quot;</source>
         <translation>&quot;%1&quot;</translation>
     </message>
+    <message>
+        <location filename="../../Gui/ComparePane.cpp" line="1054"/>
+        <source>Season</source>
+        <translation type="unfinished">Сезон</translation>
+    </message>
     <message>
         <location filename="../../Gui/ComparePane.cpp" line="1074"/>
         <source>&amp;All Selected</source>
@@ -25718,7 +27258,7 @@ Skipping file...</source>
 <context>
     <name>Routes</name>
     <message>
-        <location filename="../../Core/Route.cpp" line="442"/>
+        <location filename="../../Core/Route.cpp" line="443"/>
         <source>Route #%1</source>
         <translation>Маршрут #%1</translation>
     </message>
@@ -25771,7 +27311,7 @@ Skipping file...</source>
 <context>
     <name>SaveOnExitDialogWidget</name>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="295"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="299"/>
         <source>WARNING
 
 You have made changes to some rides which
@@ -25782,30 +27322,30 @@ have not been saved. They are listed below.</source>
 и не сохранили их. Вот эти тренировки:</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="326"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="330"/>
         <source>&amp;Save and Exit</source>
         <translation>&amp;Сохранить и выйти</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="328"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="332"/>
         <source>&amp;Discard and Exit</source>
         <translation>&amp;Отклонить и выйти</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="330"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="334"/>
         <source>&amp;Cancel Exit</source>
         <translation>&amp;Отменить выход</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="335"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="339"/>
         <source>Always check for unsaved changes on exit</source>
-        <translation>Всегда проверяйте не сохраненные изменения перед выходом  </translation>
+        <translation>Всегда проверять не сохраненные изменения перед выходом</translation>
     </message>
 </context>
 <context>
     <name>SaveSingleDialogWidget</name>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="232"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="236"/>
         <source>WARNING
 
 You have made changes to </source>
@@ -25814,35 +27354,38 @@ You have made changes to </source>
 Вы сделали изменения в </translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="228"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="232"/>
         <source>Save and Conversion</source>
         <translation>Сохранение и конвертация</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="232"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="236"/>
         <source> If you want to save
 them, we need to convert to GoldenCheetah&apos;s
 native format. Should we do so?
 </source>
-        <translation type="unfinished"></translation>
+        <translation> Для сохранения необходимо преобразовать
+данные во внутренний формат Golden Cheetah.
+Хотите сделать это?
+</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="237"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="241"/>
         <source>&amp;Save and Convert</source>
         <translation>&amp;Сохранить и конвертировать</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="239"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="243"/>
         <source>&amp;Discard Changes</source>
         <translation>&amp;Отменить изменения</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="241"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="245"/>
         <source>&amp;Cancel Save</source>
         <translation>&amp;Отменить Сохранить</translation>
     </message>
     <message>
-        <location filename="../../Gui/SaveDialogs.cpp" line="246"/>
+        <location filename="../../Gui/SaveDialogs.cpp" line="250"/>
         <source>Always warn me about file conversions</source>
         <translation>Всегда предупреждайте меня о конвертации файлов</translation>
     </message>
@@ -25920,9 +27463,13 @@ native format. Should we do so?
         <translation>Долгота (смещение градуса)</translation>
     </message>
     <message>
-        <location filename="../../Charts/ScatterPlot.cpp" line="139"/>
         <source>Circumferential Pedal Velocity (cm/s)</source>
-        <translation>Периферическая скорость педалирования (см/с)</translation>
+        <translation type="vanished">Периферическая скорость педалирования (см/с)</translation>
+    </message>
+    <message>
+        <location filename="../../Charts/ScatterPlot.cpp" line="139"/>
+        <source>Circumferential Pedal Velocity (m/s)</source>
+        <translation type="unfinished">Периферическая скорость педалирования (см/с)</translation>
     </message>
     <message>
         <location filename="../../Charts/ScatterPlot.cpp" line="140"/>
@@ -26398,54 +27945,54 @@ native format. Should we do so?
 <context>
     <name>SchemePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3650"/>
+        <location filename="../../Gui/Pages.cpp" line="4186"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3651"/>
+        <location filename="../../Gui/Pages.cpp" line="4187"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3644"/>
+        <location filename="../../Gui/Pages.cpp" line="4180"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3645"/>
+        <location filename="../../Gui/Pages.cpp" line="4181"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3660"/>
+        <location filename="../../Gui/Pages.cpp" line="4196"/>
         <source>Short</source>
         <translation>Обозначение</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3661"/>
+        <location filename="../../Gui/Pages.cpp" line="4197"/>
         <source>Long</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3662"/>
+        <location filename="../../Gui/Pages.cpp" line="4198"/>
         <source>Percent of CP</source>
         <translation>Процент от CP</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3707"/>
+        <location filename="../../Gui/Pages.cpp" line="4243"/>
         <source>Maximum of 10 zones reached.</source>
         <translation>Достигнут предел в 10 зон.</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3730"/>
-        <location filename="../../Gui/Pages.cpp" line="3737"/>
+        <location filename="../../Gui/Pages.cpp" line="4266"/>
+        <location filename="../../Gui/Pages.cpp" line="4273"/>
         <source>New</source>
         <translation>Новое</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3732"/>
-        <location filename="../../Gui/Pages.cpp" line="3739"/>
+        <location filename="../../Gui/Pages.cpp" line="4268"/>
+        <location filename="../../Gui/Pages.cpp" line="4275"/>
         <source>New (%1)</source>
         <translation>Новое (%1)</translation>
     </message>
@@ -26453,46 +28000,46 @@ native format. Should we do so?
 <context>
     <name>SearchBox</name>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="80"/>
-        <location filename="../../Gui/SearchBox.cpp" line="295"/>
+        <location filename="../../Gui/SearchBox.cpp" line="84"/>
+        <location filename="../../Gui/SearchBox.cpp" line="299"/>
         <source>Search...</source>
         <translation>Искать...</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="285"/>
+        <location filename="../../Gui/SearchBox.cpp" line="289"/>
         <source>Filter...</source>
         <translation>Фильтр...</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="340"/>
-        <location filename="../../Gui/SearchBox.cpp" line="355"/>
+        <location filename="../../Gui/SearchBox.cpp" line="344"/>
+        <location filename="../../Gui/SearchBox.cpp" line="359"/>
         <source>Add to Named Filters</source>
         <translation>Добавить в именованные фильтры</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="347"/>
-        <location filename="../../Gui/SearchBox.cpp" line="356"/>
+        <location filename="../../Gui/SearchBox.cpp" line="351"/>
+        <location filename="../../Gui/SearchBox.cpp" line="360"/>
         <source>Manage Filters</source>
         <translation>Управление фильтрами</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="349"/>
-        <location filename="../../Gui/SearchBox.cpp" line="362"/>
+        <location filename="../../Gui/SearchBox.cpp" line="353"/>
+        <location filename="../../Gui/SearchBox.cpp" line="366"/>
         <source>Column Chooser</source>
         <translation>Выбор столбцов</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="382"/>
+        <location filename="../../Gui/SearchBox.cpp" line="386"/>
         <source> and </source>
         <translation> и </translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="440"/>
+        <location filename="../../Gui/SearchBox.cpp" line="444"/>
         <source>Add new search</source>
         <translation>Добавить новый поиск</translation>
     </message>
     <message>
-        <location filename="../../Gui/SearchBox.cpp" line="441"/>
+        <location filename="../../Gui/SearchBox.cpp" line="445"/>
         <source>Name:</source>
         <translation>Имя:</translation>
     </message>
@@ -26505,76 +28052,114 @@ native format. Should we do so?
         <translation>Файл</translation>
     </message>
 </context>
+<context>
+    <name>Season</name>
+    <message>
+        <location filename="../../Core/Season.cpp" line="32"/>
+        <source>A</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="32"/>
+        <source>B</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="32"/>
+        <source>C</source>
+        <translation type="unfinished">°C</translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="32"/>
+        <source>D</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="32"/>
+        <source>E</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>Seasons</name>
     <message>
-        <location filename="../../Core/Season.cpp" line="270"/>
-        <location filename="../../Core/Season.cpp" line="432"/>
+        <location filename="../../Core/Season.cpp" line="328"/>
+        <location filename="../../Core/Season.cpp" line="504"/>
         <source>All Dates</source>
         <translation>Все даты</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="277"/>
+        <location filename="../../Core/Season.cpp" line="335"/>
         <source>This Year</source>
         <translation>Этот год</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="284"/>
+        <location filename="../../Core/Season.cpp" line="342"/>
         <source>This Month</source>
         <translation>Этот месяц</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="291"/>
+        <location filename="../../Core/Season.cpp" line="349"/>
         <source>Last Month</source>
         <translation>Предыдущий месяц</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="298"/>
+        <location filename="../../Core/Season.cpp" line="356"/>
         <source>This Week</source>
         <translation>Эта неделя</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="309"/>
+        <location filename="../../Core/Season.cpp" line="367"/>
         <source>Last Week</source>
         <translation>Предыдущая неделя</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="317"/>
+        <location filename="../../Core/Season.cpp" line="375"/>
+        <source>Last 24 hours</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="382"/>
         <source>Last 7 days</source>
         <translation>Последние 7 дней</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="324"/>
+        <location filename="../../Core/Season.cpp" line="389"/>
         <source>Last 14 days</source>
         <translation>Последние 14 дней</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="331"/>
+        <location filename="../../Core/Season.cpp" line="396"/>
         <source>Last 21 days</source>
         <translation>Последний 21 день</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="338"/>
+        <location filename="../../Core/Season.cpp" line="403"/>
         <source>Last 28 days</source>
         <translation>Последние 28 дней</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="345"/>
+        <location filename="../../Core/Season.cpp" line="410"/>
+        <source>Last 6 weeks</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Core/Season.cpp" line="417"/>
         <source>Last 2 months</source>
         <translation>Последние 2 месяца</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="352"/>
+        <location filename="../../Core/Season.cpp" line="424"/>
         <source>Last 3 months</source>
         <translation>Последние 3 месяца</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="359"/>
+        <location filename="../../Core/Season.cpp" line="431"/>
         <source>Last 6 months</source>
         <translation>Последние 6 месяцев</translation>
     </message>
     <message>
-        <location filename="../../Core/Season.cpp" line="366"/>
+        <location filename="../../Core/Season.cpp" line="438"/>
         <source>Last 12 months</source>
         <translation>Последние 12 месяцев</translation>
     </message>
@@ -26582,117 +28167,74 @@ native format. Should we do so?
 <context>
     <name>SeasonsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5847"/>
+        <location filename="../../Gui/Pages.cpp" line="6383"/>
         <source>Add</source>
         <translation>Добавить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5848"/>
+        <location filename="../../Gui/Pages.cpp" line="6384"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5849"/>
+        <location filename="../../Gui/Pages.cpp" line="6385"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5850"/>
+        <location filename="../../Gui/Pages.cpp" line="6386"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5896"/>
-        <location filename="../../Gui/Pages.cpp" line="5898"/>
-        <location filename="../../Gui/Pages.cpp" line="5989"/>
-        <location filename="../../Gui/Pages.cpp" line="5991"/>
+        <location filename="../../Gui/Pages.cpp" line="6432"/>
+        <location filename="../../Gui/Pages.cpp" line="6434"/>
+        <location filename="../../Gui/Pages.cpp" line="6525"/>
+        <location filename="../../Gui/Pages.cpp" line="6527"/>
         <source>ddd MMM d, yyyy</source>
         <translation>d MMM yyyy, ddd</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5835"/>
+        <location filename="../../Gui/Pages.cpp" line="6371"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5836"/>
+        <location filename="../../Gui/Pages.cpp" line="6372"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5830"/>
-        <location filename="../../Gui/Pages.cpp" line="5861"/>
+        <location filename="../../Gui/Pages.cpp" line="6366"/>
+        <location filename="../../Gui/Pages.cpp" line="6397"/>
         <source>Name</source>
         <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5831"/>
-        <location filename="../../Gui/Pages.cpp" line="5862"/>
+        <location filename="../../Gui/Pages.cpp" line="6367"/>
+        <location filename="../../Gui/Pages.cpp" line="6398"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5832"/>
-        <location filename="../../Gui/Pages.cpp" line="5863"/>
+        <location filename="../../Gui/Pages.cpp" line="6368"/>
+        <location filename="../../Gui/Pages.cpp" line="6399"/>
         <source>From</source>
         <translation>От</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="5833"/>
-        <location filename="../../Gui/Pages.cpp" line="5864"/>
+        <location filename="../../Gui/Pages.cpp" line="6369"/>
+        <location filename="../../Gui/Pages.cpp" line="6400"/>
         <source>To</source>
         <translation>До</translation>
     </message>
 </context>
-<context>
-    <name>SelfLoopsUploader</name>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1240"/>
-        <source>SelfLoops</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1253"/>
-        <source>no credentials set for SelfLoops. Please check Settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1270"/>
-        <source>Error uploading to Selfloops</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1274"/>
-        <source>Successfully uploaded to Selfloops</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1293"/>
-        <source>Upload to Selfloops...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1340"/>
-        <source>Upload... Sending to Selfloops</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1349"/>
-        <source>Upload to Selfloops finished.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1377"/>
-        <source> Error from Selfloops: </source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>Selfloops</name>
     <message>
         <location filename="../../Cloud/Selfloops.cpp" line="84"/>
         <source>Account is not configured,</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Аккаунт не сконфигурирован,</translation>
     </message>
     <message>
         <location filename="../../Cloud/Selfloops.cpp" line="191"/>
@@ -26705,14 +28247,14 @@ native format. Should we do so?
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Selfloops.h" line="33"/>
+        <location filename="../../Cloud/Selfloops.h" line="34"/>
         <source>Selfloops</source>
         <translation type="unfinished">Selfloops</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Selfloops.h" line="34"/>
+        <location filename="../../Cloud/Selfloops.h" line="35"/>
         <source>Upload and track your training and progress.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Загружать и отслеживать ваши тренировки и прогресс.</translation>
     </message>
 </context>
 <context>
@@ -26756,129 +28298,104 @@ native format. Should we do so?
 <context>
     <name>ShareDialog</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="105"/>
         <source>Share your activity</source>
-        <translation>Поделиться данными тренировки</translation>
+        <translation type="vanished">Поделиться данными тренировки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="116"/>
         <source>Choose which sites you wish to share on: </source>
-        <translation>На каких сайтах опубликовать:</translation>
+        <translation type="vanished">На каких сайтах опубликовать:</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="124"/>
         <source>Strava</source>
-        <translation>Strava</translation>
+        <translation type="vanished">Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="133"/>
         <source>Ride With GPS</source>
-        <translation>Ride With GPS</translation>
+        <translation type="vanished">Ride With GPS</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="142"/>
         <source>Today&apos;s Plan</source>
-        <translation type="unfinished">Today&apos;s Plan</translation>
+        <translation type="obsolete">Today&apos;s Plan</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="151"/>
         <source>Cycling Analytics</source>
-        <translation>Cycling Analytics</translation>
+        <translation type="vanished">Cycling Analytics</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="160"/>
         <source>Selfloops</source>
-        <translation>Selfloops</translation>
+        <translation type="vanished">Selfloops</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="169"/>
         <source>VeloHero</source>
-        <translation>VeloHero</translation>
+        <translation type="vanished">VeloHero</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="178"/>
         <source>Trainingstagebuch.org</source>
-        <translation>Trainingstagebuch.org</translation>
+        <translation type="vanished">Trainingstagebuch.org</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="187"/>
         <source>SportPlusHealth</source>
-        <translation>SportPlusHealth</translation>
+        <translation type="vanished">SportPlusHealth</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="210"/>
         <source>Choose a name for your activity: </source>
-        <translation>Выберите название для тренировки: </translation>
+        <translation type="vanished">Выберите название для тренировки: </translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="255"/>
         <source>Private</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Закрытая</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="256"/>
         <source>Commute</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Комьютинг</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="257"/>
         <source>Trainer</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Тренажёр</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="297"/>
         <source>&amp;Upload Activity</source>
-        <translation>&amp;Закачать тренировку</translation>
+        <translation type="vanished">&amp;Закачать тренировку</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="421"/>
         <source>This activity is marked as already on %1. Are you sure you want to upload it?</source>
-        <translation>Эта тренировка помечена как уже отправленная на %1. Вы точно хотите закачать её?</translation>
+        <translation type="vanished">Эта тренировка помечена как уже отправленная на %1. Вы точно хотите закачать её?</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="248"/>
         <source>Choose which data series you wish to send: </source>
-        <translation>Какие данные отправить:</translation>
+        <translation type="vanished">Какие данные отправить:</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="251"/>
         <source>Altitude</source>
-        <translation>Высота</translation>
+        <translation type="vanished">Высота</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="252"/>
         <source>Power</source>
-        <translation>Мощность</translation>
+        <translation type="vanished">Мощность</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="253"/>
         <source>Cadence</source>
-        <translation>Каденс</translation>
+        <translation type="vanished">Каденс</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="254"/>
         <source>Heartrate</source>
-        <translation>ЧСС</translation>
+        <translation type="vanished">ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="299"/>
         <source>&amp;Close</source>
-        <translation>&amp;Закрыть</translation>
+        <translation type="vanished">&amp;Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="323"/>
         <source>No share site selected !</source>
-        <translation>Ни один сайт не выбран!</translation>
+        <translation type="vanished">Ни один сайт не выбран!</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="425"/>
         <source>OK</source>
-        <translation>ОК</translation>
+        <translation type="vanished">ОК</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="426"/>
         <source>Cancel</source>
-        <translation>Отмена</translation>
+        <translation type="vanished">Отмена</translation>
     </message>
 </context>
 <context>
@@ -26909,23 +28426,23 @@ native format. Should we do so?
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/SixCycle.cpp" line="442"/>
-        <location filename="../../Cloud/SixCycle.cpp" line="470"/>
+        <location filename="../../Cloud/SixCycle.cpp" line="452"/>
+        <location filename="../../Cloud/SixCycle.cpp" line="480"/>
         <source>Completed.</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SixCycle.cpp" line="446"/>
+        <location filename="../../Cloud/SixCycle.cpp" line="456"/>
         <source>Network Error - Upload failed.</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SixCycle.h" line="37"/>
+        <location filename="../../Cloud/SixCycle.h" line="38"/>
         <source>Sixcycle</source>
         <translation type="unfinished">Sixcycle</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SixCycle.h" line="38"/>
+        <location filename="../../Cloud/SixCycle.h" line="39"/>
         <source>Sync with the innovative training site.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27347,7 +28864,7 @@ native format. Should we do so?
     <message>
         <location filename="../../Gui/SplitActivityWizard.cpp" line="667"/>
         <location filename="../../Gui/SplitActivityWizard.cpp" line="671"/>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="814"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="859"/>
         <source>Confirm</source>
         <translation>Подтвердить</translation>
     </message>
@@ -27357,7 +28874,7 @@ native format. Should we do so?
         <translation>Разделение тренировки невозможно отменить</translation>
     </message>
     <message>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="815"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="860"/>
         <source>%1 file(s) will be created.
 
 Are you sure you wish to proceed?</source>
@@ -27366,22 +28883,22 @@ Are you sure you wish to proceed?</source>
 Продолжить?</translation>
     </message>
     <message>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="825"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="870"/>
         <source>Removed</source>
         <translation>Удалено</translation>
     </message>
     <message>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="839"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="884"/>
         <source>Saved</source>
         <translation>Сохранено</translation>
     </message>
     <message>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="845"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="890"/>
         <source>Completed</source>
         <translation>Завершено</translation>
     </message>
     <message>
-        <location filename="../../Gui/SplitActivityWizard.cpp" line="846"/>
+        <location filename="../../Gui/SplitActivityWizard.cpp" line="891"/>
         <source>Split Activity Completed</source>
         <translation>Разделение тренировки завершено</translation>
     </message>
@@ -27523,46 +29040,8 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>SportPlusHealthUploader</name>
     <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="35"/>
         <source>SportPlusHealth</source>
-        <translation>SportPlusHealth</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="51"/>
-        <source>Cannot upload to SportPlusHealth without credentials. Check Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="70"/>
-        <source>sending to SportPlusHealth...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="150"/>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="161"/>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="210"/>
-        <source>error uploading to SportPlusHealth</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="151"/>
-        <source>request failed: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="162"/>
-        <source>request failed, Server response: %1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="211"/>
-        <source>failed to upload file (cod. %1)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/SportPlusHealthUploader.cpp" line="220"/>
-        <source>successfully uploaded to SportPlusHealth</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">SportPlusHealth</translation>
     </message>
 </context>
 <context>
@@ -27578,23 +29057,23 @@ If the newly created activity clashes with an existing activity (same date and t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportTracks.cpp" line="504"/>
-        <location filename="../../Cloud/SportTracks.cpp" line="559"/>
+        <location filename="../../Cloud/SportTracks.cpp" line="538"/>
+        <location filename="../../Cloud/SportTracks.cpp" line="593"/>
         <source>Completed.</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportTracks.cpp" line="563"/>
+        <location filename="../../Cloud/SportTracks.cpp" line="597"/>
         <source>Network Error - Upload failed.</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportTracks.h" line="37"/>
+        <location filename="../../Cloud/SportTracks.h" line="38"/>
         <source>SportTracks.mobi</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportTracks.h" line="38"/>
+        <location filename="../../Cloud/SportTracks.h" line="39"/>
         <source>Sync with the popular multisport website.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27612,12 +29091,12 @@ If the newly created activity clashes with an existing activity (same date and t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportsPlusHealth.h" line="33"/>
+        <location filename="../../Cloud/SportsPlusHealth.h" line="34"/>
         <source>SportPlusHealth</source>
         <translation type="unfinished">SportPlusHealth</translation>
     </message>
     <message>
-        <location filename="../../Cloud/SportsPlusHealth.h" line="34"/>
+        <location filename="../../Cloud/SportsPlusHealth.h" line="35"/>
         <source>Upload to the cycling and running site.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -27794,40 +29273,44 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>Strava</name>
     <message>
-        <location filename="../../Cloud/Strava.cpp" line="84"/>
+        <location filename="../../Cloud/Strava.cpp" line="92"/>
         <source>No authorisation token configured.</source>
-        <translation type="unfinished"></translation>
+        <translation>Не сконфигурирован токен авторизации.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Strava.cpp" line="108"/>
+        <location filename="../../Cloud/Strava.cpp" line="116"/>
         <source>You must authorise with Strava first</source>
-        <translation type="unfinished"></translation>
+        <translation>Вы должны вначале авторизоваться в Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Strava.cpp" line="140"/>
+        <location filename="../../Cloud/Strava.cpp" line="156"/>
         <source>Network Problem reading Strava data</source>
-        <translation type="unfinished"></translation>
+        <translation>Проблемы с сетью при чтении данных Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Strava.cpp" line="345"/>
+        <location filename="../../Cloud/Strava.cpp" line="381"/>
         <source>invalid response or parser exception.</source>
-        <translation type="unfinished">Некорректный ответ или ошибка обработки.</translation>
+        <translation>Некорректный ответ или ошибка обработки.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Strava.cpp" line="363"/>
-        <location filename="../../Cloud/Strava.cpp" line="387"/>
+        <location filename="../../Cloud/Strava.cpp" line="399"/>
+        <location filename="../../Cloud/Strava.cpp" line="423"/>
         <source>Completed.</source>
-        <translation type="unfinished">Завершено.</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/Strava.h" line="33"/>
-        <source>Strava</source>
-        <translation type="unfinished">Strava</translation>
+        <translation>Завершено.</translation>
     </message>
     <message>
         <location filename="../../Cloud/Strava.h" line="34"/>
+        <source>Strava</source>
+        <translation>Strava</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Strava.h" line="35"/>
+        <source>Sync with the social network for cyclists and runners.</source>
+        <translation>Синхронизировать с социальной сетью для велосипедистов и бегунов.</translation>
+    </message>
+    <message>
         <source>Upload to the social network for cyclists and runners.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Загрузить в социальную сеть для велосипедистов и бегунов.</translation>
     </message>
 </context>
 <context>
@@ -27879,61 +29362,50 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>StravaUploader</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="454"/>
         <source>Strava</source>
-        <translation>Strava</translation>
+        <translation type="vanished">Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="469"/>
         <source>no Strava token set. Please authorize in Settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Не задан токен. Пожалуйста авторизуйтесь в Настройках.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="471"/>
         <source>Strava support isn&apos;t enabled in this build</source>
-        <translation>В этой сборке нет поддержки Strava</translation>
+        <translation type="vanished">В этой сборке нет поддержки Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="494"/>
         <source>Error uploading to Strava</source>
-        <translation>Ошибка загрузки на Strava</translation>
+        <translation type="vanished">Ошибка загрузки на Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="499"/>
         <source>Successfully uploaded to Strava
 </source>
-        <translation type="unfinished">Успешно загружено на Strava
+        <translation type="obsolete">Успешно загружено на Strava
 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="508"/>
         <source>Upload activity to Strava...</source>
-        <translation>Загрузить тренировку на Strava...</translation>
+        <translation type="vanished">Загрузить тренировку на Strava...</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="611"/>
         <source>Upload... Sending to Strava</source>
-        <translation>Загрузка... Данные отправляются на Strava</translation>
+        <translation type="vanished">Загрузка... Данные отправляются на Strava</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="683"/>
         <source>Processing...</source>
-        <translation>Выполняется обработка...</translation>
+        <translation type="vanished">Выполняется обработка...</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="620"/>
         <source>Upload to Strava finished.</source>
-        <translation>Загрузка на Strava завершена.</translation>
+        <translation type="vanished">Загрузка на Strava завершена.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="654"/>
         <source>invalid response or parser exception.</source>
-        <translation type="unfinished">Некорректный ответ или ошибка обработки.</translation>
+        <translation type="obsolete">Некорректный ответ или ошибка обработки.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="664"/>
         <source> Error from Strava: </source>
-        <translation> Сообщение об ошибке от Strava: </translation>
+        <translation type="vanished"> Сообщение об ошибке от Strava: </translation>
     </message>
 </context>
 <context>
@@ -27984,22 +29456,22 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>SummaryMetricsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2600"/>
+        <location filename="../../Gui/Pages.cpp" line="3136"/>
         <source>Available Metrics</source>
         <translation>Доступные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2605"/>
+        <location filename="../../Gui/Pages.cpp" line="3141"/>
         <source>Selected Metrics</source>
         <translation>Выбранные показатели</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2621"/>
+        <location filename="../../Gui/Pages.cpp" line="3157"/>
         <source>Up</source>
         <translation>Поднять</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="2622"/>
+        <location filename="../../Gui/Pages.cpp" line="3158"/>
         <source>Down</source>
         <translation>Опустить</translation>
     </message>
@@ -28316,14 +29788,6 @@ If the newly created activity clashes with an existing activity (same date and t
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>BikeStress</name>
-    <message>
-        <location filename="../../Metrics/Coggan.cpp" line="225"/>
-        <source>Training Stress Score takes into account both the intensity and the duration of the training session, it can be computed as 100 * hours * IF^2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>TSSPerHour</name>
     <message>
@@ -28371,57 +29835,57 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>Themes</name>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="600"/>
+        <location filename="../../Gui/Colors.cpp" line="605"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="608"/>
+        <location filename="../../Gui/Colors.cpp" line="613"/>
         <source>Corporate Junky</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="618"/>
+        <location filename="../../Gui/Colors.cpp" line="623"/>
         <source>Neutral Blue</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="626"/>
+        <location filename="../../Gui/Colors.cpp" line="631"/>
         <source>Firenze</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="634"/>
+        <location filename="../../Gui/Colors.cpp" line="639"/>
         <source>Mustang</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="642"/>
+        <location filename="../../Gui/Colors.cpp" line="647"/>
         <source>Japanese Garden</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="650"/>
+        <location filename="../../Gui/Colors.cpp" line="655"/>
         <source>Zen and Tea</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="658"/>
+        <location filename="../../Gui/Colors.cpp" line="663"/>
         <source>Mono (dark)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="666"/>
+        <location filename="../../Gui/Colors.cpp" line="671"/>
         <source>Mono (light)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="675"/>
+        <location filename="../../Gui/Colors.cpp" line="680"/>
         <source>Schoberer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Gui/Colors.cpp" line="684"/>
+        <location filename="../../Gui/Colors.cpp" line="689"/>
         <source>Classic</source>
         <translation type="unfinished"></translation>
     </message>
@@ -28505,72 +29969,37 @@ If the newly created activity clashes with an existing activity (same date and t
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TodaysPlan.cpp" line="448"/>
-        <location filename="../../Cloud/TodaysPlan.cpp" line="480"/>
+        <location filename="../../Cloud/TodaysPlan.cpp" line="471"/>
+        <location filename="../../Cloud/TodaysPlan.cpp" line="503"/>
         <source>Completed.</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TodaysPlan.cpp" line="452"/>
+        <location filename="../../Cloud/TodaysPlan.cpp" line="475"/>
         <source>Network Error - Upload failed.</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TodaysPlan.h" line="37"/>
+        <location filename="../../Cloud/TodaysPlan.h" line="38"/>
         <source>Today&apos;s Plan</source>
         <translation type="unfinished">Today&apos;s Plan</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TodaysPlan.h" line="38"/>
+        <location filename="../../Cloud/TodaysPlan.h" line="39"/>
         <source>Sync with the smarter training site.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>TodaysPlanUploader</name>
+    <name>TodaysPlanBodyMeasures</name>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="935"/>
-        <source>TodaysPlan</source>
+        <location filename="../../Cloud/TodaysPlanBodyMeasures.cpp" line="55"/>
+        <source>You must authorise with Today&apos;s Plan first</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="948"/>
-        <source>no Today&apos;s Plan token set. Please authorize in Settings.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="950"/>
-        <source>Today&apos;s Plan support isn&apos;t enabled in this build</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="973"/>
-        <source>Error uploading to Today&apos;s Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="977"/>
-        <source>Successfully uploaded to Today&apos;s Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="984"/>
-        <source>Upload to Today&apos;s Plan...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1029"/>
-        <source>Upload... Sending to Today&apos;s Plan</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1038"/>
-        <source>Upload to Today&apos;s Plan finished.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/ShareDialog.cpp" line="1069"/>
-        <source> Error from Today&apos;s Plan: </source>
+        <location filename="../../Cloud/TodaysPlanBodyMeasures.cpp" line="165"/>
+        <source>Response parsing error: %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -28589,12 +30018,12 @@ If the newly created activity clashes with an existing activity (same date and t
     <message>
         <location filename="../../Train/TodaysPlanWorkoutDownload.cpp" line="51"/>
         <source>From:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">От:</translation>
     </message>
     <message>
         <location filename="../../Train/TodaysPlanWorkoutDownload.cpp" line="52"/>
         <source>To:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">До:</translation>
     </message>
     <message>
         <location filename="../../Train/TodaysPlanWorkoutDownload.cpp" line="60"/>
@@ -28937,18 +30366,18 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>TotalCalories</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3637"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3695"/>
         <source>Calories (HR)</source>
         <translation>Калории (ЧСС)</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3638"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3639"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3696"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3697"/>
         <source>kcal</source>
         <translation>ккал</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3641"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="3699"/>
         <source>Total Calories estimated from Time Moving, Heart Rate, Weight, Sex and Age</source>
         <translation>Общее количество калорий, оценивается исходя из времени движения, ЧСС, а так же веса, пола и возраста</translation>
     </message>
@@ -28979,18 +30408,18 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>TotalWork</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="825"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="883"/>
         <source>Work</source>
         <translation>Расход энергии</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="826"/>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="827"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="884"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="885"/>
         <source>kJ</source>
         <translation>кДж</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="828"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="886"/>
         <source>Total Work in kJ computed from power data</source>
         <translation>Общий расход энергии в кДж из показаний мощности</translation>
     </message>
@@ -29005,17 +30434,17 @@ If the newly created activity clashes with an existing activity (same date and t
 <context>
     <name>TrainConfig</name>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="478"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="489"/>
         <source>Train Devices</source>
         <translation>Устройства</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="479"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="490"/>
         <source>Preferences</source>
-        <translation type="unfinished">Настройки</translation>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../../Gui/ConfigDialog.cpp" line="480"/>
+        <location filename="../../Gui/ConfigDialog.cpp" line="491"/>
         <source>Remote Controls</source>
         <translation>Удалённое управление</translation>
     </message>
@@ -29059,289 +30488,312 @@ Click Cancel to exit.</source>
 <context>
     <name>TrainOptionsPage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1549"/>
+        <location filename="../../Gui/Pages.cpp" line="2069"/>
         <source>Auto-connect devices in Train View</source>
         <translation type="unfinished">Автоматически подключать устройства в режиме занятия</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1552"/>
+        <location filename="../../Gui/Pages.cpp" line="2072"/>
         <source>Allow multiple devices in Train View</source>
         <translation type="unfinished">Разрешить несколько устройств в режиме занятия</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1555"/>
+        <location filename="../../Gui/Pages.cpp" line="2075"/>
         <source>Auto-hide bottom bar in Train View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Автоматически скрывать нижнюю панель в режиме занятия</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1561"/>
+        <location filename="../../Gui/Pages.cpp" line="2081"/>
         <source>Play sound before new lap</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Проигрывать звук перед новым кругом</translation>
     </message>
 </context>
 <context>
     <name>TrainSidebar</name>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="241"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="244"/>
         <source>Save workout data</source>
         <translation>Сохранить данные тренировки</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="247"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="250"/>
         <source>Devices</source>
         <translation>Устройства</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="250"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="255"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="268"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="276"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="253"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="258"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="271"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="279"/>
         <source>Menu</source>
         <translation>Меню</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="254"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="257"/>
         <source>Workouts</source>
         <translation>Тренировки</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="267"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="270"/>
         <source>Media</source>
         <translation>Медиафайлы</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="275"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="278"/>
         <source>VideoSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="420"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="423"/>
         <source>Import Workout from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="421"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="424"/>
         <source>Get Workouts from ErgDB</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="422"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="425"/>
         <source>Get Workouts from Today&apos;s Plan</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="423"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="426"/>
         <source>Create Workout via Wizard</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="424"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="427"/>
         <source>Scan for Workouts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="448"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="451"/>
         <source>Delete selected Workout</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="451"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="454"/>
         <source>Delete %1 selected Workouts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="475"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="478"/>
         <source>Train mode active</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="475"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="478"/>
         <source>Please stop the train mode before closing the window or application.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="545"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="548"/>
         <source>Remove reference to selected video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="560"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="563"/>
         <source>Import VideoSync from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="561"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="564"/>
         <source>Scan for VideoSyncs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="574"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="577"/>
         <source>Delete selected VideoSync</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="836"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="903"/>
         <source>Are you sure you want to remove the reference to this video?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="838"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="900"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="976"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="905"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="967"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1043"/>
         <source>Remove</source>
         <translation>Удалить</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="871"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="938"/>
         <source>Are you sure you want to delete this VideoSync?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="898"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="965"/>
         <source>The VideoSync file is either not valid or not existing and will be removed from the library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="932"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="999"/>
         <source>Are you sure you want to delete this Workout?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="935"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1002"/>
         <source>Are you sure you want to delete this %1 workouts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="974"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1041"/>
         <source>The Workout file is either not valid or not existing and will be removed from the library.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1068"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1135"/>
         <source>Resuming..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1095"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1162"/>
         <source>Paused..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1196"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1263"/>
         <source>Starting..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1351"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1431"/>
         <source>Stopped..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1421"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1501"/>
         <source>Connected..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1439"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1519"/>
         <source>Disconnected..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1724"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1848"/>
         <source>New lap..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1980"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="1984"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="2037"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1865"/>
+        <source>Recalibrating steering..</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/TrainSidebar.cpp" line="2119"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2123"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2176"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2227"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2231"/>
         <source>Requesting calibration..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1991"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2130"/>
         <source>Calibrating...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Калибровка...</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1995"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2134"/>
         <source>Calibrating...
 Current speed %1 kph
 Increase speed to %2 kph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1999"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2138"/>
         <source>Calibrating...
 Stop pedalling until speed drops to 0</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2004"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2143"/>
         <source>Calibration completed successfully!
 Spindown %1 ms
 Zero Offset %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2012"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="2063"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2151"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2202"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2254"/>
         <source>Calibration failed!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2031"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2170"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2221"/>
         <source>Unclip or stop pedalling to begin calibration..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2050"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2189"/>
         <source>Calibrating...
 Unclip or stop pedalling until process is completed..
 Torque %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2055"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2194"/>
         <source>Calibration completed successfully!
 Zero Offset %1
 Torque %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2095"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2241"/>
+        <source>Calibrating...
+Unclip or stop pedalling until process is completed..
+Zero Offset %1</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/TrainSidebar.cpp" line="2246"/>
+        <source>Calibration completed successfully!
+Zero Offset %1
+Slope %2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Train/TrainSidebar.cpp" line="2287"/>
         <source>Fast forward..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2116"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2308"/>
         <source>Rewind..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2159"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2351"/>
         <source>Increasing intensity..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2185"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2377"/>
         <source>Decreasing intensity..</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="531"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="534"/>
         <source>Import Video from File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="532"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="535"/>
         <source>Scan for Videos</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="873"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="945"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="2428"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="940"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1012"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2620"/>
         <source>Delete</source>
         <translation>Удалить</translation>
     </message>
@@ -29350,50 +30802,50 @@ Torque %2</source>
         <translation type="vanished">Вы действительно хотите удалить эту тренировку?</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1742"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1877"/>
         <source>No Devices Configured</source>
         <translation>Нет настроенных устройств</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1742"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="1877"/>
         <source>Please configure a device in Preferences.</source>
         <translation>Пожалуйста настройте устройства в Параметрах.</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1942"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2081"/>
         <source>Exiting calibration..</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Выход из калибровки..</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1957"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2096"/>
         <source>Calibration not supported for this device.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Калибровка не поддерживается для этого устройства.</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="1964"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2103"/>
         <source>Calibrating...
 Press F3 on Controller when done.</source>
-        <translation>Выполняется калибровка...
-После завершения нажмите F3 для контроллера.</translation>
+        <translation type="unfinished">Выполняется калибровка...
+После завершения нажмите F3 на контроллере.</translation>
     </message>
     <message>
         <source>Done</source>
         <translation type="vanished">Закрыть</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2380"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="2398"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2572"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2590"/>
         <source>Add Device</source>
         <translation>Добавить устройство</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2385"/>
-        <location filename="../../Train/TrainSidebar.cpp" line="2403"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2577"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2595"/>
         <source>Delete Device</source>
         <translation>Удалить устройство</translation>
     </message>
     <message>
-        <location filename="../../Train/TrainSidebar.cpp" line="2426"/>
+        <location filename="../../Train/TrainSidebar.cpp" line="2618"/>
         <source>Are you sure you want to delete this device?</source>
         <translation>Вы действительно хотите удалить это устройство?</translation>
     </message>
@@ -29401,47 +30853,54 @@ Press F3 on Controller when done.</source>
 <context>
     <name>TrainingStageBuch</name>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="125"/>
+        <source>Completed.</source>
+        <translation type="obsolete">Завершено.</translation>
+    </message>
+</context>
+<context>
+    <name>TrainingsTageBuch</name>
+    <message>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="125"/>
         <source>failed to parse Settings response: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="130"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="130"/>
         <source>failed to get settings: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="174"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="174"/>
         <source>failed to parse Session response: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="179"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="179"/>
         <source>failed to get new session: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="186"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="186"/>
         <source>got empty session</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="292"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="292"/>
         <source>Completed.</source>
         <translation type="unfinished">Завершено.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.cpp" line="294"/>
+        <location filename="../../Cloud/TrainingsTageBuch.cpp" line="294"/>
         <source>Error - Upload failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.h" line="45"/>
-        <source>TrainingStageBuch</source>
-        <translation type="unfinished"></translation>
+        <location filename="../../Cloud/TrainingsTageBuch.h" line="46"/>
+        <source>Trainingstagebuch</source>
+        <translation type="unfinished">Trainingstagebuch</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TrainingStageBuch.h" line="46"/>
+        <location filename="../../Cloud/TrainingsTageBuch.h" line="47"/>
         <source>Upload to your online and mobile training log.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -29449,99 +30908,8 @@ Press F3 on Controller when done.</source>
 <context>
     <name>TrainingstagebuchUploader</name>
     <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="86"/>
         <source>Trainingstagebuch.org</source>
-        <translation type="unfinished">Trainingstagebuch.org</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="104"/>
-        <source>Cannot upload to Trainingstagebuch without credentials. Check Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="122"/>
-        <source>Error uploading to Trainingstagebuch.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="125"/>
-        <source>successfully uploaded to Trainingstagebuch.org as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="136"/>
-        <source>getting Settings from Trainingstagebuch.org...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="172"/>
-        <source>getting new Trainingstagebuch.org Session...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="209"/>
-        <source>preparing Trainingstagebuch.org data ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="232"/>
-        <source>temporary file too large for upload: %1 &gt; %1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="250"/>
-        <source>sending to Trainingstagebuch.org ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="283"/>
-        <source>request failed: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="294"/>
-        <source>request failed, Server response: %1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="362"/>
-        <source>failed to parse Settings response: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="370"/>
-        <source>failed to get settings: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="420"/>
-        <source>failed to parse Session response: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="428"/>
-        <source>failed to get new session: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="438"/>
-        <source>got empty session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="480"/>
-        <source>failed to parse upload response: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="488"/>
-        <source>failed to upload file: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TrainingstagebuchUploader.cpp" line="498"/>
-        <source>got empty exercise</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">Trainingstagebuch.org</translation>
     </message>
 </context>
 <context>
@@ -29560,39 +30928,39 @@ Press F3 on Controller when done.</source>
     <message>
         <location filename="../../Charts/TreeMapWindow.cpp" line="94"/>
         <source>First</source>
-        <translation>1-й критерий</translation>
+        <translation>Первый</translation>
     </message>
     <message>
         <location filename="../../Charts/TreeMapWindow.cpp" line="95"/>
         <source>Second</source>
-        <translation>2-й критерий</translation>
+        <translation>Второй</translation>
     </message>
     <message>
         <location filename="../../Charts/TreeMapWindow.cpp" line="110"/>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="133"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="137"/>
         <source>Metric</source>
         <translation>Показатель</translation>
     </message>
     <message>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="136"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="140"/>
         <source>Date range</source>
         <translation>Диапазон дат</translation>
     </message>
     <message>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="290"/>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="291"/>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="292"/>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="293"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="294"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="295"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="296"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="297"/>
         <source>(unknown)</source>
         <translation>(неизвестно)</translation>
     </message>
     <message>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="313"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="317"/>
         <source>%1 activities</source>
         <translation>%1 тренировок</translation>
     </message>
     <message>
-        <location filename="../../Charts/TreeMapWindow.cpp" line="321"/>
+        <location filename="../../Charts/TreeMapWindow.cpp" line="325"/>
         <source>None</source>
         <translation>Нет</translation>
     </message>
@@ -29601,213 +30969,167 @@ Press F3 on Controller when done.</source>
     <name>TriScore</name>
     <message>
         <location filename="../../Metrics/SwimScore.cpp" line="390"/>
-        <source>TriScore combined stress metric based on Dr. Skiba stress metrics, defined as BikeScore for cycling, GOVSS for running and SwimScore for swimming</source>
+        <source>TriScore combined stress metric based on Dr. Skiba stress metrics, defined as BikeScore for cycling, GOVSS for running and SwimScore for swimming. On zero fallback to TRIMP Zonal Points for HR based score.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TwitterDialog</name>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="38"/>
         <source>Choose which metrics you wish to tweet: </source>
-        <translation>Выберите, какие показатели вы хотите отправить на твиттер: </translation>
+        <translation type="vanished">Выберите, какие показатели вы хотите отправить на твиттер: </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="40"/>
         <source>Workout Time</source>
-        <translation>Время тренировки</translation>
+        <translation type="vanished">Время тренировки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="35"/>
         <source>Tweet Activity</source>
-        <translation>Написать о тренировке в Twitter</translation>
+        <translation type="vanished">Написать о тренировке в Twitter</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="41"/>
         <source>Time Moving</source>
-        <translation>Время в пути</translation>
+        <translation type="vanished">Время в пути</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="42"/>
         <source>Total Distance</source>
-        <translation>Общая дистанция</translation>
+        <translation type="vanished">Общая дистанция</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="43"/>
         <source>Elevation Gain</source>
-        <translation>Набор высоты</translation>
+        <translation type="vanished">Набор высоты</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="44"/>
         <source>Total Work (kJ)</source>
-        <translation>Общий расход энергии (кДж)</translation>
+        <translation type="vanished">Общий расход энергии (кДж)</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="45"/>
         <source>Average Speed</source>
-        <translation>Средняя скорость</translation>
+        <translation type="vanished">Средняя скорость</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="46"/>
         <source>Average Power</source>
-        <translation>Средняя мощность</translation>
+        <translation type="vanished">Средняя мощность</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="47"/>
         <source>Average Heart Rate</source>
-        <translation>Средняя ЧСС</translation>
+        <translation type="vanished">Средняя ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="48"/>
         <source>Average Cadence</source>
-        <translation>Средний каденс</translation>
+        <translation type="vanished">Средний каденс</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="49"/>
         <source>Max Power</source>
-        <translation>Максимальная мощность</translation>
+        <translation type="vanished">Максимальная мощность</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="50"/>
         <source>Max Heart Rate</source>
-        <translation>Максимальная ЧСС</translation>
+        <translation type="vanished">Максимальная ЧСС</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="67"/>
         <source>Twitter Message:</source>
-        <translation>Сообщение:</translation>
+        <translation type="vanished">Сообщение:</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="71"/>
         <source>Message Length: </source>
-        <translation>Длина сообщения:</translation>
+        <translation type="vanished">Длина сообщения:</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="76"/>
         <source>&amp;Tweet Activity</source>
-        <translation>&amp;Написать</translation>
+        <translation type="vanished">&amp;Написать</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="208"/>
         <source>Time Moving: %1 </source>
-        <translation>Время в пути: %1 </translation>
+        <translation type="vanished">Время в пути: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="78"/>
         <source>&amp;Cancel</source>
-        <translation>&amp;Отмена</translation>
+        <translation type="vanished">&amp;Отмена</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="128"/>
         <source>Golden Cheetah-&gt;Preferences</source>
-        <translation>Golden Cheetah-&gt;Настройки</translation>
+        <translation type="vanished">Golden Cheetah-&gt;Настройки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="130"/>
         <source>Tools-&gt;Options</source>
-        <translation>Настрйки-&gt;Настройки</translation>
+        <translation type="vanished">Настрйки-&gt;Настройки</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="132"/>
         <source>Error fetching OAuth credentials.  Please make sure to complete the twitter authorization procedure found under %1.</source>
-        <translation>Error fetching OAuth credentials.  Please make sure to complete the twitter authorization procedure found under %1.</translation>
+        <translation type="vanished">Error fetching OAuth credentials.  Please make sure to complete the twitter authorization procedure found under %1.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="133"/>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="163"/>
         <source>OAuth Error</source>
-        <translation>OAuth Error</translation>
+        <translation type="vanished">OAuth Error</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="141"/>
         <source>Tweet Length Error</source>
-        <translation>Ошибка длины сообщения</translation>
+        <translation type="vanished">Ошибка длины сообщения</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="141"/>
         <source>Tweet must be 140 characters or less.</source>
-        <translation>В твите должно быть не больше 140 символов.</translation>
+        <translation type="vanished">В твите должно быть не больше 140 символов.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="162"/>
-        <source>Internal error in OAuth request - NULL, invalid Endpoint or invalid request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="187"/>
         <source>Tweet sent</source>
-        <translation>Твит отправлен</translation>
+        <translation type="vanished">Твит отправлен</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="188"/>
         <source>Tweet successfully sent.</source>
-        <translation>Твит успешно отправлен.</translation>
+        <translation type="vanished">Твит успешно отправлен.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="181"/>
         <source>Error Posting Tweet</source>
-        <translation>Error Posting Tweet</translation>
+        <translation type="vanished">Error Posting Tweet</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="182"/>
         <source>There was an error connecting to Twitter.  Check your network connection and try again.</source>
-        <translation>Ошибка подключения к Twitter.  Проверьте ваше подключение к сети и попытайтесь еще раз.</translation>
+        <translation type="vanished">Ошибка подключения к Twitter.  Проверьте ваше подключение к сети и попытайтесь еще раз.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="207"/>
         <source>Duration: %1 </source>
-        <translation>Длительность: %1 </translation>
+        <translation type="vanished">Длительность: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="209"/>
         <source>Distance: %1 </source>
-        <translation>Дистанция: %1 </translation>
+        <translation type="vanished">Дистанция: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="210"/>
         <source>Climbing: %1 </source>
-        <translation>Набор высоты: %1 </translation>
+        <translation type="vanished">Набор высоты: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="211"/>
         <source>Work: %1 </source>
-        <translation>Расход энергии: %1 </translation>
+        <translation type="vanished">Расход энергии: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="212"/>
         <source>Avg Speed: %1 </source>
-        <translation>Ср. скорость: %1</translation>
+        <translation type="vanished">Ср. скорость: %1</translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="213"/>
         <source>Avg Power: %1 </source>
-        <translation>Ср. мощность: %1 </translation>
+        <translation type="vanished">Ср. мощность: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="214"/>
         <source>Avg HR: %1 </source>
-        <translation>Ср. ЧСС: %1 </translation>
+        <translation type="vanished">Ср. ЧСС: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="215"/>
         <source>Avg Cadence: %1 </source>
-        <translation>Ср. каденс: %1 </translation>
+        <translation type="vanished">Ср. каденс: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="216"/>
         <source>Max Power: %1 </source>
-        <translation>Макс. мощность: %1 </translation>
+        <translation type="vanished">Макс. мощность: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="217"/>
         <source>Max HR: %1 </source>
-        <translation>Макс. ЧСС: %1 </translation>
+        <translation type="vanished">Макс. ЧСС: %1 </translation>
     </message>
     <message>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="245"/>
-        <location filename="../../Cloud/TwitterDialog.cpp" line="253"/>
         <source>Message Length: %1</source>
-        <translation>Длина сообщения: %1</translation>
+        <translation type="vanished">Длина сообщения: %1</translation>
     </message>
 </context>
 <context>
@@ -29826,12 +31148,12 @@ Press F3 on Controller when done.</source>
 <context>
     <name>VAM</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2403"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2461"/>
         <source>VAM</source>
         <translation>VAM</translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2407"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="2465"/>
         <source>Velocita Ascensionale Media, average ascent speed in vertical meters per hour</source>
         <translation>Средняя скорость подъёма (скороподъёмность), средняя вертикальная скорость набора высоты в метрах в час</translation>
     </message>
@@ -30002,84 +31324,8 @@ Press F3 on Controller when done.</source>
 <context>
     <name>VeloHeroUploader</name>
     <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="87"/>
         <source>VeloHero</source>
-        <translation>VeloHero</translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="104"/>
-        <source>Cannot upload to VeloHero without credentials. Check Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="121"/>
-        <source>Error uploading to VeloHero</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="124"/>
-        <source>successfully uploaded to VeloHero as %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="135"/>
-        <source>getting new VeloHero session...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="173"/>
-        <source>preparing VeloHero data ...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="193"/>
-        <source>temporary file too large for upload: %1 &gt; %1 bytes</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="211"/>
-        <source>sending to VeloHero...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="244"/>
-        <source>request failed: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="255"/>
-        <source>request failed, server response: %1 %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="307"/>
-        <source>failed to parse session response: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="315"/>
-        <source>failed to get new session: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="325"/>
-        <source>got empty session</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="367"/>
-        <source>failed to parse upload response: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="375"/>
-        <source>failed to upload file: </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../Cloud/VeloHeroUploader.cpp" line="385"/>
-        <source>got empty exercise</source>
-        <translation type="unfinished"></translation>
+        <translation type="vanished">VeloHero</translation>
     </message>
 </context>
 <context>
@@ -30110,12 +31356,12 @@ Press F3 on Controller when done.</source>
         <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/Velohero.h" line="38"/>
+        <location filename="../../Cloud/Velohero.h" line="39"/>
         <source>Velohero</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Cloud/Velohero.h" line="39"/>
+        <location filename="../../Cloud/Velohero.h" line="40"/>
         <source>Upload your rides to the independent and free cycling training log</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30167,19 +31413,19 @@ Press F3 on Controller when done.</source>
 <context>
     <name>ViewSplitter</name>
     <message>
-        <location filename="../../Gui/TabView.h" line="184"/>
+        <location filename="../../Gui/TabView.h" line="187"/>
         <source>Clear</source>
         <translation>Очистить</translation>
     </message>
     <message>
-        <location filename="../../Gui/TabView.h" line="195"/>
-        <location filename="../../Gui/TabView.h" line="276"/>
+        <location filename="../../Gui/TabView.h" line="198"/>
+        <location filename="../../Gui/TabView.h" line="279"/>
         <source>OFF</source>
         <translatorcomment>кнопки панели сравнения</translatorcomment>
         <translation>Отключено</translation>
     </message>
     <message>
-        <location filename="../../Gui/TabView.h" line="271"/>
+        <location filename="../../Gui/TabView.h" line="274"/>
         <source>ON</source>
         <translatorcomment>кнопки панели сравнения</translatorcomment>
         <translation>Включено</translation>
@@ -30625,12 +31871,12 @@ Press F3 on Controller when done.</source>
 <context>
     <name>WattsRPE</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1470"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1528"/>
         <source>Watts:RPE Ratio</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1475"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1533"/>
         <source>Watts to RPE ratio</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30673,12 +31919,16 @@ Press F3 on Controller when done.</source>
 <context>
     <name>Withings</name>
     <message>
-        <location filename="../../Cloud/Withings.h" line="36"/>
         <source>Withings</source>
-        <translation type="unfinished">Withings</translation>
+        <translation type="obsolete">Withings</translation>
     </message>
     <message>
         <location filename="../../Cloud/Withings.h" line="37"/>
+        <source>Nokia Health (Withings)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Withings.h" line="38"/>
         <source>Download weight, body fat etc from the connected health specialists.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30706,9 +31956,13 @@ Press F3 on Controller when done.</source>
         <translation type="unfinished">OAuth Error</translation>
     </message>
     <message>
-        <location filename="../../Cloud/WithingsDownload.cpp" line="154"/>
+        <location filename="../../Cloud/WithingsDownload.cpp" line="177"/>
+        <source>Error parsing Withings API response. Please check the error description.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <source>Withings Data Download</source>
-        <translation>Скачивание данных Withings</translation>
+        <translation type="vanished">Скачивание данных Withings</translation>
     </message>
     <message>
         <source>No new measurements</source>
@@ -30719,12 +31973,13 @@ Press F3 on Controller when done.</source>
         <translation type="vanished">Получено новых замеров: %1.</translation>
     </message>
     <message>
-        <location filename="../../Cloud/WithingsDownload.cpp" line="164"/>
+        <location filename="../../Cloud/WithingsDownload.cpp" line="167"/>
+        <location filename="../../Cloud/WithingsDownload.cpp" line="176"/>
         <source>Error</source>
         <translation type="unfinished">Ошибка</translation>
     </message>
     <message>
-        <location filename="../../Cloud/WithingsDownload.cpp" line="165"/>
+        <location filename="../../Cloud/WithingsDownload.cpp" line="168"/>
         <source>There was an error during fetching. Please check the error description.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30736,12 +31991,12 @@ Press F3 on Controller when done.</source>
 <context>
     <name>Workbeats</name>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1423"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1481"/>
         <source>Workbeat stress</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1428"/>
+        <location filename="../../Metrics/BasicRideMetrics.cpp" line="1486"/>
         <source>Work * Heartbeats / 100000</source>
         <translation type="unfinished"></translation>
     </message>
@@ -30888,12 +32143,12 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>WorkoutWidget</name>
     <message>
-        <location filename="../../Train/WorkoutWidget.cpp" line="1496"/>
+        <location filename="../../Train/WorkoutWidget.cpp" line="1500"/>
         <source>File save failed.</source>
         <translation>Ошибка сохранения файла.</translation>
     </message>
     <message>
-        <location filename="../../Train/WorkoutWidget.cpp" line="2292"/>
+        <location filename="../../Train/WorkoutWidget.cpp" line="2311"/>
         <source>Intensity</source>
         <translation>Интенсивность</translation>
     </message>
@@ -30984,24 +32239,24 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>XDataDialog</name>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="41"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="44"/>
         <source>xData</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="55"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="58"/>
         <source>Data Series</source>
         <translation type="unfinished">Серия данных</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="75"/>
-        <location filename="../../FileIO/XDataDialog.cpp" line="77"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="78"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="80"/>
         <source>Add</source>
         <translation type="unfinished">Добавить</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="76"/>
-        <location filename="../../FileIO/XDataDialog.cpp" line="78"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="79"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="81"/>
         <source>Delete</source>
         <translation type="unfinished">Удалить</translation>
     </message>
@@ -31080,32 +32335,32 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>XDataSeriesSettingsDialog</name>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="329"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="333"/>
         <source>Name</source>
         <translation>Название</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="334"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="338"/>
         <source>Units</source>
         <translation>Единицы измерения</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="342"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="346"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="343"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="347"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="358"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="362"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="358"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="362"/>
         <source>Name is blank</source>
         <translation>Название не указано</translation>
     </message>
@@ -31113,48 +32368,48 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>XDataSettingsDialog</name>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="259"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="262"/>
         <source>xData</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="266"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="269"/>
         <source>Data Series</source>
         <translation type="unfinished">Серия данных</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="267"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="270"/>
         <source>Units</source>
         <translation type="unfinished">Единицы измерения</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="271"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="274"/>
         <source>Series %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="278"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="281"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="279"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="282"/>
         <source>OK</source>
         <translation>ОК</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="294"/>
-        <location filename="../../FileIO/XDataDialog.cpp" line="309"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="297"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="313"/>
         <source>Error</source>
         <translation>Ошибка</translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="294"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="297"/>
         <source>XData name is blank</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../FileIO/XDataDialog.cpp" line="309"/>
+        <location filename="../../FileIO/XDataDialog.cpp" line="313"/>
         <source>Must have at least one data series.</source>
         <translation type="unfinished"></translation>
     </message>
@@ -31256,6 +32511,40 @@ You can remove references when managing the library via the context menu options
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>Xert</name>
+    <message>
+        <location filename="../../Cloud/Xert.cpp" line="139"/>
+        <source>JSON parser error</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Xert.cpp" line="174"/>
+        <source>You must authorise with Xert first</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Xert.cpp" line="478"/>
+        <location filename="../../Cloud/Xert.cpp" line="569"/>
+        <source>Completed.</source>
+        <translation type="unfinished">Завершено.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Xert.cpp" line="571"/>
+        <source>Network Error - Upload failed.</source>
+        <translation type="unfinished">Ошибка сети — выгрузка файла не удалась.</translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Xert.h" line="38"/>
+        <source>Xert</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Cloud/Xert.h" line="39"/>
+        <source>Sync with the innovative site for fitness monitoring, tracking, and planning.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ZonePTime1</name>
     <message>
@@ -31389,27 +32678,27 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>ZonePage</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3558"/>
+        <location filename="../../Gui/Pages.cpp" line="4094"/>
         <source>Sport</source>
         <translation>Вид спорта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3560"/>
+        <location filename="../../Gui/Pages.cpp" line="4096"/>
         <source>Bike</source>
         <translation>Велоспорт</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3561"/>
+        <location filename="../../Gui/Pages.cpp" line="4097"/>
         <source>Run</source>
         <translation>Бег</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3602"/>
+        <location filename="../../Gui/Pages.cpp" line="4138"/>
         <source>Critical Power</source>
         <translation>Критическая мощность (CP)</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="3603"/>
+        <location filename="../../Gui/Pages.cpp" line="4139"/>
         <source>Default</source>
         <translation>По умолчанию</translation>
     </message>
@@ -31653,47 +32942,47 @@ You can remove references when managing the library via the context menu options
         <translation>Нейромышечная мощность</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="162"/>
+        <location filename="../../Metrics/Zones.cpp" line="163"/>
         <source>Zone defaults must be specified at head of %1 file</source>
         <translation>Зоны по умолчанию должны быть заданы в заголовке файла %1</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="168"/>
+        <location filename="../../Metrics/Zones.cpp" line="169"/>
         <source>Only one set of zone defaults may be specified in %1 file</source>
         <translation>Только один набор зон по умолчанию может быть задан в файле %1</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="194"/>
+        <location filename="../../Metrics/Zones.cpp" line="195"/>
         <source>line %1: read new range without reading any zones for previous one</source>
         <translation>строка %1: чтение нового диапазона без чтения уровней для предшествующего</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="299"/>
+        <location filename="../../Metrics/Zones.cpp" line="300"/>
         <source>line %1: read zone without preceding date range</source>
         <translation>строка %1: чтение уровня без предшествующего диапазона дат</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="321"/>
-        <location filename="../../Metrics/Zones.cpp" line="351"/>
+        <location filename="../../Metrics/Zones.cpp" line="322"/>
+        <location filename="../../Metrics/Zones.cpp" line="352"/>
         <source>attempt to set zone based on % of CP without setting CP in line number %1.
 </source>
         <translation>попытка установить уровни основываясь на % CP не устанавливая значение CP в строке номер %1.
 </translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="392"/>
+        <location filename="../../Metrics/Zones.cpp" line="393"/>
         <source>file ended without reading any zones for last range</source>
         <translation>файл закончился без прочтения зон для последнего диапазона</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="445"/>
+        <location filename="../../Metrics/Zones.cpp" line="446"/>
         <source>Setting end date of range %1 to start date of range %2.
 </source>
         <translation>Установка конечной даты диапазона %1 стартовой датой диапазона %2.
 </translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="455"/>
+        <location filename="../../Metrics/Zones.cpp" line="456"/>
         <source>Extending final range %1 to infinite to include present date.
 </source>
         <translation>Расширение конечного диапазона %1 до бесконечности, чтобы включить текущую дату.
@@ -31704,66 +32993,66 @@ You can remove references when managing the library via the context menu options
         <translation type="vanished">КМ должна быть больше нуля в диапазоне уровней %1 уровней мощности</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="485"/>
+        <location filename="../../Metrics/Zones.cpp" line="486"/>
         <source>Range %1: matching top of zone %2 (%3) to bottom of zone %4 (%5).
 </source>
         <translation>Диапазон %1: совмещение верха уровня %2 (%3) с низом зоны %4 (%5).
 </translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="499"/>
+        <location filename="../../Metrics/Zones.cpp" line="500"/>
         <source>Range %1: setting top of zone %2 from %3 to MAX.
 </source>
         <translation>Диапазон %1: установка верха уровня %2 с %3 до максимума.
 </translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="733"/>
+        <location filename="../../Metrics/Zones.cpp" line="734"/>
         <source>Critical Power (watts): %1</source>
         <translation>Критическая мощность (Вт): %1</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="741"/>
+        <location filename="../../Metrics/Zones.cpp" line="742"/>
         <source>&lt;td align=&quot;center&quot;&gt;Low (watts)&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Нижняя граница (Вт)&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="742"/>
+        <location filename="../../Metrics/Zones.cpp" line="743"/>
         <source>&lt;td align=&quot;center&quot;&gt;High (watts)&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Верхняя граница (Вт)&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="744"/>
+        <location filename="../../Metrics/Zones.cpp" line="745"/>
         <source>&lt;td align=&quot;center&quot;&gt;%&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;%&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="872"/>
+        <location filename="../../Metrics/Zones.cpp" line="873"/>
         <source>Problem Saving Power Zones</source>
         <translation>Не удалось сохранить зоны мощности</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="873"/>
+        <location filename="../../Metrics/Zones.cpp" line="874"/>
         <source>File: %1 cannot be opened for &apos;Writing&apos;. Please check file properties.</source>
         <translation>Не удалось открыть на запись файл %1. Проверьте его свойства.</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="739"/>
+        <location filename="../../Metrics/Zones.cpp" line="740"/>
         <source>&lt;td align=&quot;center&quot;&gt;Zone&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Зона&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="462"/>
+        <location filename="../../Metrics/Zones.cpp" line="463"/>
         <source>CP must be greater than zero in zone range %1 of %2</source>
         <translation>Критическая мощность (CP) должна быть выше нуля в пределах зоны %1 из %2</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="740"/>
+        <location filename="../../Metrics/Zones.cpp" line="741"/>
         <source>&lt;td align=&quot;center&quot;&gt;Description&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Описание&lt;/td&gt;</translation>
     </message>
     <message>
-        <location filename="../../Metrics/Zones.cpp" line="743"/>
+        <location filename="../../Metrics/Zones.cpp" line="744"/>
         <source>&lt;td align=&quot;center&quot;&gt;Time&lt;/td&gt;</source>
         <translation>&lt;td align=&quot;center&quot;&gt;Время&lt;/td&gt;</translation>
     </message>
@@ -31776,6 +33065,14 @@ You can remove references when managing the library via the context menu options
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>aBikeStress</name>
+    <message>
+        <location filename="../../Metrics/aCoggan.cpp" line="215"/>
+        <source>Altitude Adjusted Training Stress Score takes into account both the intensity and the duration of the training session plus the altitude effect, it can be computed as 100 * hours * aIF^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>aEfficiencyFactor</name>
     <message>
@@ -31854,14 +33151,6 @@ You can remove references when managing the library via the context menu options
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>aBikeStress</name>
-    <message>
-        <location filename="../../Metrics/aCoggan.cpp" line="215"/>
-        <source>Altitude Adjusted Training Stress Score takes into account both the intensity and the duration of the training session plus the altitude effect, it can be computed as 100 * hours * aIF^2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>aTSSPerHour</name>
     <message>
@@ -31954,31 +33243,44 @@ You can remove references when managing the library via the context menu options
 <context>
     <name>deviceModel</name>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1434"/>
+        <location filename="../../Gui/Pages.cpp" line="1954"/>
         <source>Device Name</source>
         <translation>Имя устройства</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1436"/>
+        <location filename="../../Gui/Pages.cpp" line="1956"/>
         <source>Device Type</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1438"/>
+        <location filename="../../Gui/Pages.cpp" line="1958"/>
         <source>Port Spec</source>
         <translation>Спецификация порта</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1440"/>
+        <location filename="../../Gui/Pages.cpp" line="1960"/>
         <source>Profile</source>
         <translation>Профиль</translation>
     </message>
     <message>
-        <location filename="../../Gui/Pages.cpp" line="1442"/>
+        <location filename="../../Gui/Pages.cpp" line="1962"/>
         <source>Virtual</source>
         <translation type="unfinished">Виртуальный</translation>
     </message>
 </context>
+<context>
+    <name>hrv_recovery_points</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="817"/>
+        <source>HRV Recovery Points</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="822"/>
+        <source>Natural Log transform of rMSSD, measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>pnnx</name>
     <message>
@@ -31998,6 +33300,139 @@ You can remove references when managing the library via the context menu options
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>rest_avnn</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="593"/>
+        <source>Rest AVNN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="594"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="595"/>
+        <source>msec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="597"/>
+        <source>Average of all NN intervals measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_hf</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="779"/>
+        <source>Rest HF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="780"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="781"/>
+        <source>msec^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="784"/>
+        <source>High Frequency Power HRV, measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_hr</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="557"/>
+        <source>Rest HR</source>
+        <translation type="unfinished">ЧСС в покое</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="558"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="559"/>
+        <source>bpm</source>
+        <translation type="unfinished">уд/мин</translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="561"/>
+        <source>Average HR measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_lf</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="741"/>
+        <source>Rest LF</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="742"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="743"/>
+        <source>msec^2</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="746"/>
+        <source>Low Frequency Power HRV, measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_pNN50</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="704"/>
+        <source>Rest PNN50</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="705"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="706"/>
+        <source>pct</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="708"/>
+        <source>Percentage of differences between adjacent NN intervals that are greater than 50 ms, measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_rmssd</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="667"/>
+        <source>Rest rMSSD</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="668"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="669"/>
+        <source>msec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="671"/>
+        <source>Square root of the mean of the squares of differences between adjacent NN intervals, measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>rest_sdnn</name>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="630"/>
+        <source>Rest SDNN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="631"/>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="632"/>
+        <source>msec</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../../Metrics/HrvMetrics.cpp" line="634"/>
+        <source>Standard deviation of all NN intervals measured at rest</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>rmssd</name>
     <message>