diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2021-06-29 16:10:41 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2021-06-29 16:10:41 -0700 |
| commit | a529f90d46cebaee7fc7644c6595d753b7fe78c8 (patch) | |
| tree | 6fac75096d1f155f0590b4c331c86559276c92a0 /translations/subsurface_ru_RU.ts | |
| parent | 48c2b4b1bd8c23dacc52fff48b338784d7f2520e (diff) | |
| download | subsurface-a529f90d46cebaee7fc7644c6595d753b7fe78c8.tar.gz | |
Latest translations from Transifex
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1565 |
1 files changed, 818 insertions, 747 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 35999a143..f6e50281f 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -355,15 +355,20 @@ <context> <name>CheckCloudConnection</name> <message numerus="yes"> - <location filename="../core/checkcloudconnection.cpp" line="58"/> + <location filename="../core/checkcloudconnection.cpp" line="68"/> <source>Waiting for cloud connection (%n second(s) passed)</source> <translation><numerusform>Ожидание подключения к облаку (прошла %n секунда)</numerusform><numerusform>Ожидание подключения к облаку (прошло %n секунды)</numerusform><numerusform>Ожидание подключения к облаку (прошло %n секунд)</numerusform><numerusform>Ожидание подключения к облаку (прошло %n секунд)</numerusform></translation> </message> <message> - <location filename="../core/checkcloudconnection.cpp" line="65"/> + <location filename="../core/checkcloudconnection.cpp" line="82"/> <source>Cloud connection failed</source> <translation>Ошибка соединения с облаком</translation> </message> + <message> + <location filename="../core/checkcloudconnection.cpp" line="123"/> + <source>Trying different cloud server...</source> + <translation type="unfinished"/> + </message> </context> <context> <name>CloudCredentials</name> @@ -895,82 +900,82 @@ <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="738"/> + <location filename="../commands/command_edit.cpp" line="746"/> <source>Paste onto %n dive(s)</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="814"/> + <location filename="../commands/command_edit.cpp" line="824"/> <source>Replan dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="814"/> + <location filename="../commands/command_edit.cpp" line="824"/> <source>Edit profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../commands/command_edit.cpp" line="862"/> + <location filename="../commands/command_edit.cpp" line="872"/> <source>Add weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="864"/> + <location filename="../commands/command_edit.cpp" line="874"/> <source>Add weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="950"/> + <location filename="../commands/command_edit.cpp" line="960"/> <source>Remove weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="952"/> + <location filename="../commands/command_edit.cpp" line="962"/> <source>Remove weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="983"/> + <location filename="../commands/command_edit.cpp" line="993"/> <source>Edit weight</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="985"/> + <location filename="../commands/command_edit.cpp" line="995"/> <source>Edit weight (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1039"/> + <location filename="../commands/command_edit.cpp" line="1049"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="1041"/> + <location filename="../commands/command_edit.cpp" line="1051"/> <source>Add cylinder (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1160"/> + <location filename="../commands/command_edit.cpp" line="1170"/> <source>Remove cylinder</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="1162"/> + <location filename="../commands/command_edit.cpp" line="1172"/> <source>Remove cylinder (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1210"/> + <location filename="../commands/command_edit.cpp" line="1220"/> <source>Edit cylinder</source> <translation type="unfinished"/> </message> <message numerus="yes"> - <location filename="../commands/command_edit.cpp" line="1212"/> + <location filename="../commands/command_edit.cpp" line="1222"/> <source>Edit cylinder (%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../commands/command_edit.cpp" line="1287"/> + <location filename="../commands/command_edit.cpp" line="1297"/> <source>Edit dive [%1]</source> <translation type="unfinished"/> </message> @@ -2738,58 +2743,68 @@ <context> <name>DiveComponentSelection</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="341"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="345"/> <source>Dive site: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="343"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="347"/> <source>Dive master: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="345"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="349"/> <source>Buddy: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="347"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="351"/> <source>Rating: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="349"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="353"/> <source>Visibility: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="351"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="355"/> <source>Notes: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="353"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="357"/> <source>Suit: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="355"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="359"/> <source>Tags: </source> <translation>Метки:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="365"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="369"/> <source>Cylinders: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="373"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="377"/> <source>Weights: </source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="384"/> + <source>Dive number: </source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="386"/> + <source>Date / time: </source> + <translation type="unfinished"/> + </message> </context> <context> <name>DiveComponentSelectionDialog</name> @@ -2865,7 +2880,17 @@ <translation>Оценка</translation> </message> <message> - <location filename="../desktop-widgets/divecomponentselection.ui" line="146"/> + <location filename="../desktop-widgets/divecomponentselection.ui" line="143"/> + <source>Dive Number</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divecomponentselection.ui" line="150"/> + <source>Date / Time</source> + <translation>Дата / Время</translation> + </message> + <message> + <location filename="../desktop-widgets/divecomponentselection.ui" line="160"/> <source>You can paste these to another dive or as text to another application.</source> <translation type="unfinished"/> </message> @@ -3192,38 +3217,38 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="187"/> + <location filename="../profile-widget/diveeventitem.cpp" line="169"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="191"/> + <location filename="../profile-widget/diveeventitem.cpp" line="173"/> <source>ICD</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="192"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>ΔHe</source> <translation>ΔHe</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="193"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source>ΔN₂</source> <translation>ΔN₂</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="213"/> + <location filename="../profile-widget/diveeventitem.cpp" line="195"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="215"/> + <location filename="../profile-widget/diveeventitem.cpp" line="197"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="216"/> + <location filename="../profile-widget/diveeventitem.cpp" line="198"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -3261,117 +3286,123 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="328"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="329"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="175"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="29"/> + <source>Completed manual sync with cloud +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DiveList.qml" line="176"/> <source><unnamed dive site></source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="243"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="244"/> <source>Remove dive %1 from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="251"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="252"/> <source>Add dive %1 to trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="259"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="260"/> <source>Add dive %1 to trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="267"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="268"/> <source>Create trip with dive %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Mark dive as valid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Mark dive as invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="289"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="297"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="298"/> <source>Edit trip details</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="310"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="315"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="316"/> <source>Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="330"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="331"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="336"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="337"/> <source>Cloud credentials</source> <translation>Учетные данные в облаке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="346"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="345"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="346"/> <source>Please wait, updating the dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="390"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="391"/> <source>Fulltext</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="391"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="392"/> <source>People</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="392"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="393"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="450"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="451"/> <source>Download dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="461"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="462"/> <source>Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="472"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="473"/> <source>Filter dives</source> <translation type="unfinished"/> </message> @@ -3379,127 +3410,127 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="772"/> + <location filename="../desktop-widgets/divelistview.cpp" line="777"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="774"/> + <location filename="../desktop-widgets/divelistview.cpp" line="779"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="778"/> + <location filename="../desktop-widgets/divelistview.cpp" line="783"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="782"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="788"/> <source>Remove dive(s) from trip</source> - <translation>Удалить из поездки</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="783"/> + <location filename="../desktop-widgets/divelistview.cpp" line="790"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="798"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="805"/> <source>Add dive(s) to trip immediately above</source> - <translation>Добавить к поездке сверху</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="800"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="807"/> <source>Add dive(s) to trip immediately below</source> - <translation>Добавить к поездке снизу</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="804"/> + <location filename="../desktop-widgets/divelistview.cpp" line="811"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="805"/> + <location filename="../desktop-widgets/divelistview.cpp" line="812"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="809"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="816"/> <source>Delete dive(s)</source> - <translation>Удалить</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="811"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="818"/> <source>Mark dive(s) valid</source> - <translation type="unfinished"/> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="813"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="820"/> <source>Mark dive(s) invalid</source> - <translation>Пометить как ошибочное(-ые)</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="816"/> + <location filename="../desktop-widgets/divelistview.cpp" line="823"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="818"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="825"/> <source>Add dive(s) to arbitrary trip</source> - <translation type="unfinished"/> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> - <message> - <location filename="../desktop-widgets/divelistview.cpp" line="819"/> + <message numerus="yes"> + <location filename="../desktop-widgets/divelistview.cpp" line="826"/> <source>Renumber dive(s)</source> - <translation>Перенумеровать</translation> + <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="820"/> + <location filename="../desktop-widgets/divelistview.cpp" line="827"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="821"/> + <location filename="../desktop-widgets/divelistview.cpp" line="828"/> <source>Split selected dives</source> <translation>Разбить выделенные погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="822"/> + <location filename="../desktop-widgets/divelistview.cpp" line="829"/> <source>Load media from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="823"/> + <location filename="../desktop-widgets/divelistview.cpp" line="830"/> <source>Load media from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Open media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="852"/> + <location filename="../desktop-widgets/divelistview.cpp" line="859"/> <source>Media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="860"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="854"/> + <location filename="../desktop-widgets/divelistview.cpp" line="861"/> <source>Video files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="855"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="926"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> @@ -3763,7 +3794,7 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.ui" line="559"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="116"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="118"/> <location filename="../subsurface/desktop-widgets/ui_divelogexportdialog.h" line="412"/> <source>Light</source> <translation>Светлая</translation> @@ -3775,151 +3806,151 @@ GPS location:</source> <translation>Песочная</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="85"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> <source>Generic format that is used for data exchange between a variety of diving related programs.</source> <translation>Распространенный формат, используемый для обмена данными между различными дайверскими программами.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="87"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> <source>Comma separated values describing the dive profile as downloaded from dive computer.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="89"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> <source>Comma separated values of the dive information. This includes most of the dive details but no profile information.</source> <translation>Информация о погружении в виде значений, разделенных запятой. Включает почти все детали кроме профиля.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="91"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> <source>Send the dive data to divelogs.de website.</source> <translation>Отправить данные погружения на сайт divelogs.de.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="93"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> <source>Send the dive data to dive-share.appspot.com website.</source> <translation>Отправить данные погружения на сайт dive-share.appspot.com.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/> <source>HTML export of the dive locations, visualized on a world map.</source> <translation>HTML экспорт мест погружений на карте мира.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="97"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/> <source>Subsurface native XML format.</source> <translation>Собственный XML-формат Subsurface.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/> <source>Subsurface dive sites native XML format.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="101"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> <source>Write depths of images to file.</source> <translation>Выгружает имена фотографий и глубины, на которых они были сделаны.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="103"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/> <source>Write dive as TeX macros to file.</source> <translation>Сохранить погружение как макрос TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="105"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="107"/> <source>Write dive as LaTeX macros to file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="107"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="109"/> <source>Write the profile image as PNG file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="109"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="111"/> <source>Write the computed Profile Panel data to a CSV file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="175"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/> <source>UDDF files</source> <translation>Файлы UDDF</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="151"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="183"/> <source>Export CSV file as</source> <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/> <source>CSV files</source> <translation>Файлы CSV</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/> <source>Export world map</source> <translation>Файл для экспорта карты</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="163"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="205"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="191"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="237"/> <source>HTML files</source> <translation>Файлы HTML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="167"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> <source>Export Subsurface XML</source> <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="196"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="205"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="204"/> <source>Export Subsurface dive sites XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="186"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="214"/> <source>Save image depths</source> <translation>Экспорт глубин фотографий</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="218"/> <source>Export to TeX file</source> <translation>Экспорт в TeX-файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="190"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="218"/> <source>TeX files</source> <translation>Файлы TeX</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="224"/> <source>Save profile image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="198"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> <source>Save profile data</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="204"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="236"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="251"/> <source>Please wait, exporting...</source> <translation>Ожидайте, идет экспорт...</translation> </message> @@ -4003,11 +4034,7 @@ GPS location:</source> <translation>Tab</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/> - <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source> - <translation>Перетаскивайте заголовки так, чтобы они соответствовали колонам с данными.</translation> - </message> - <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="812"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="912"/> @@ -4015,48 +4042,74 @@ GPS location:</source> <translation>Выборка времени</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="694"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="813"/> <source>Sample depth</source> <translation>Выборка глубины</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="696"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="814"/> - <source>Sample temperature</source> - <translation>Выборка температуры</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="698"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="815"/> - <source>Sample pO₂</source> - <translation>Выборка pO₂</translation> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="716"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="825"/> + <source>Sample setpoint</source> + <translation>Выборка установки</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="700"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="816"/> <source>Sample sensor1 pO₂</source> <translation>Выборка 1-го сеносора pO₂</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="702"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="817"/> <source>Sample sensor2 pO₂</source> <translation>Выборка 2-го сеносора pO₂</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="704"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="818"/> <source>Sample sensor3 pO₂</source> <translation>Выборка 3-го сеносора pO₂</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="698"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="815"/> + <source>Sample pO₂</source> + <translation>Выборка pO₂</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="696"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="814"/> + <source>Sample temperature</source> + <translation>Выборка температуры</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="706"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="819"/> <source>Sample CNS</source> <translation>Выборка CNS</translation> </message> <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="576"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="712"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="822"/> + <source>Sample stopdepth</source> + <translation>Выборка остановки</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/> + <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source> + <translation>Перетаскивайте заголовки так, чтобы они соответствовали колонам с данными.</translation> + </message> + <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="708"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="820"/> <source>Sample NDL</source> @@ -4069,24 +4122,12 @@ GPS location:</source> <translation>Выборка TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="712"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="822"/> - <source>Sample stopdepth</source> - <translation>Выборка остановки</translation> - </message> - <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="714"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="823"/> <source>Sample pressure</source> <translation>Выборка давления</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="716"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="825"/> - <source>Sample setpoint</source> - <translation>Выборка установки</translation> - </message> - <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="720"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="811"/> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> @@ -4334,62 +4375,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="198"/> + <location filename="../qt-models/diveplannermodel.cpp" line="209"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="298"/> + <location filename="../qt-models/diveplannermodel.cpp" line="293"/> <source>cyl.</source> <translation>балл.</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="422"/> + <location filename="../qt-models/diveplannermodel.cpp" line="416"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="424"/> + <location filename="../qt-models/diveplannermodel.cpp" line="418"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="426"/> + <location filename="../qt-models/diveplannermodel.cpp" line="420"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="428"/> + <location filename="../qt-models/diveplannermodel.cpp" line="422"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="430"/> + <location filename="../qt-models/diveplannermodel.cpp" line="424"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="432"/> + <location filename="../qt-models/diveplannermodel.cpp" line="426"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1127"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1200"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1133"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1206"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1136"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1209"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1183"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1256"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -4675,27 +4716,27 @@ GPS location:</source> <translation>Путевые точки плана</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="38"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="37"/> <source>Available gases</source> <translation>Доступные смеси</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="39"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="38"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="68"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="61"/> <source>Add dive data point</source> <translation>Добавить путевую точку</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="78"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="70"/> <source>Save new</source> <translation>Сохранить новый</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="192"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="184"/> <source>kg/ℓ</source> <translation>кг/л</translation> </message> @@ -4703,107 +4744,97 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> - <source>Ambient pressure</source> - <translation>Внешнее давление</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/> - <source>Gradient factor</source> - <translation>Градиент-фактор</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="158"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -5022,196 +5053,196 @@ p, li { white-space: pre-wrap; } <translation> (показано %1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="308"/> - <location filename="../qt-models/divetripmodel.cpp" line="377"/> - <location filename="../qt-models/divetripmodel.cpp" line="417"/> + <location filename="../qt-models/divetripmodel.cpp" line="328"/> + <location filename="../qt-models/divetripmodel.cpp" line="397"/> + <location filename="../qt-models/divetripmodel.cpp" line="437"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="310"/> - <location filename="../qt-models/divetripmodel.cpp" line="379"/> - <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="330"/> + <location filename="../qt-models/divetripmodel.cpp" line="399"/> + <location filename="../qt-models/divetripmodel.cpp" line="439"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="312"/> - <location filename="../qt-models/divetripmodel.cpp" line="381"/> - <location filename="../qt-models/divetripmodel.cpp" line="421"/> + <location filename="../qt-models/divetripmodel.cpp" line="332"/> + <location filename="../qt-models/divetripmodel.cpp" line="401"/> + <location filename="../qt-models/divetripmodel.cpp" line="441"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="314"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="334"/> + <location filename="../qt-models/divetripmodel.cpp" line="443"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="314"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="334"/> + <location filename="../qt-models/divetripmodel.cpp" line="443"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="314"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="334"/> + <location filename="../qt-models/divetripmodel.cpp" line="443"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="316"/> - <location filename="../qt-models/divetripmodel.cpp" line="385"/> - <location filename="../qt-models/divetripmodel.cpp" line="425"/> + <location filename="../qt-models/divetripmodel.cpp" line="336"/> + <location filename="../qt-models/divetripmodel.cpp" line="405"/> + <location filename="../qt-models/divetripmodel.cpp" line="445"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="318"/> - <location filename="../qt-models/divetripmodel.cpp" line="427"/> + <location filename="../qt-models/divetripmodel.cpp" line="338"/> + <location filename="../qt-models/divetripmodel.cpp" line="447"/> <source>Temp.(°%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="320"/> - <location filename="../qt-models/divetripmodel.cpp" line="429"/> + <location filename="../qt-models/divetripmodel.cpp" line="340"/> + <location filename="../qt-models/divetripmodel.cpp" line="449"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="320"/> - <location filename="../qt-models/divetripmodel.cpp" line="429"/> + <location filename="../qt-models/divetripmodel.cpp" line="340"/> + <location filename="../qt-models/divetripmodel.cpp" line="449"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="320"/> - <location filename="../qt-models/divetripmodel.cpp" line="429"/> + <location filename="../qt-models/divetripmodel.cpp" line="340"/> + <location filename="../qt-models/divetripmodel.cpp" line="449"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="322"/> - <location filename="../qt-models/divetripmodel.cpp" line="391"/> - <location filename="../qt-models/divetripmodel.cpp" line="431"/> + <location filename="../qt-models/divetripmodel.cpp" line="342"/> + <location filename="../qt-models/divetripmodel.cpp" line="411"/> + <location filename="../qt-models/divetripmodel.cpp" line="451"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="324"/> - <location filename="../qt-models/divetripmodel.cpp" line="393"/> - <location filename="../qt-models/divetripmodel.cpp" line="433"/> + <location filename="../qt-models/divetripmodel.cpp" line="344"/> + <location filename="../qt-models/divetripmodel.cpp" line="413"/> + <location filename="../qt-models/divetripmodel.cpp" line="453"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="326"/> - <location filename="../qt-models/divetripmodel.cpp" line="395"/> - <location filename="../qt-models/divetripmodel.cpp" line="435"/> + <location filename="../qt-models/divetripmodel.cpp" line="346"/> + <location filename="../qt-models/divetripmodel.cpp" line="415"/> + <location filename="../qt-models/divetripmodel.cpp" line="455"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="330"/> - <location filename="../qt-models/divetripmodel.cpp" line="439"/> + <location filename="../qt-models/divetripmodel.cpp" line="350"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="330"/> - <location filename="../qt-models/divetripmodel.cpp" line="439"/> + <location filename="../qt-models/divetripmodel.cpp" line="350"/> + <location filename="../qt-models/divetripmodel.cpp" line="459"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="332"/> - <location filename="../qt-models/divetripmodel.cpp" line="399"/> - <location filename="../qt-models/divetripmodel.cpp" line="441"/> + <location filename="../qt-models/divetripmodel.cpp" line="352"/> + <location filename="../qt-models/divetripmodel.cpp" line="419"/> + <location filename="../qt-models/divetripmodel.cpp" line="461"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="334"/> + <location filename="../qt-models/divetripmodel.cpp" line="354"/> <source>Max. CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="336"/> - <location filename="../qt-models/divetripmodel.cpp" line="403"/> - <location filename="../qt-models/divetripmodel.cpp" line="445"/> + <location filename="../qt-models/divetripmodel.cpp" line="356"/> + <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="465"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="338"/> - <location filename="../qt-models/divetripmodel.cpp" line="447"/> + <location filename="../qt-models/divetripmodel.cpp" line="358"/> + <location filename="../qt-models/divetripmodel.cpp" line="467"/> <source>Media before/during/after dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="340"/> - <location filename="../qt-models/divetripmodel.cpp" line="407"/> + <location filename="../qt-models/divetripmodel.cpp" line="360"/> + <location filename="../qt-models/divetripmodel.cpp" line="427"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="342"/> - <location filename="../qt-models/divetripmodel.cpp" line="409"/> - <location filename="../qt-models/divetripmodel.cpp" line="449"/> + <location filename="../qt-models/divetripmodel.cpp" line="362"/> + <location filename="../qt-models/divetripmodel.cpp" line="429"/> + <location filename="../qt-models/divetripmodel.cpp" line="469"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="344"/> - <location filename="../qt-models/divetripmodel.cpp" line="411"/> - <location filename="../qt-models/divetripmodel.cpp" line="451"/> + <location filename="../qt-models/divetripmodel.cpp" line="364"/> + <location filename="../qt-models/divetripmodel.cpp" line="431"/> + <location filename="../qt-models/divetripmodel.cpp" line="471"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="383"/> + <location filename="../qt-models/divetripmodel.cpp" line="403"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="387"/> + <location filename="../qt-models/divetripmodel.cpp" line="407"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="389"/> + <location filename="../qt-models/divetripmodel.cpp" line="409"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="397"/> + <location filename="../qt-models/divetripmodel.cpp" line="417"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="401"/> - <location filename="../qt-models/divetripmodel.cpp" line="443"/> + <location filename="../qt-models/divetripmodel.cpp" line="421"/> + <location filename="../qt-models/divetripmodel.cpp" line="463"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="405"/> + <location filename="../qt-models/divetripmodel.cpp" line="425"/> <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="479"/> + <location filename="../qt-models/divetripmodel.cpp" line="499"/> <source>finish populating data store</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="481"/> + <location filename="../qt-models/divetripmodel.cpp" line="501"/> <source>setting up internal data structures</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="484"/> + <location filename="../qt-models/divetripmodel.cpp" line="503"/> <source>done setting up internal data structures</source> <translation type="unfinished"/> </message> @@ -6299,8 +6330,8 @@ Existing Site</source> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="30"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="454"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="424"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="449"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="423"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="448"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="511"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="512"/> <source>Notes</source> @@ -6331,7 +6362,7 @@ Existing Site</source> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="244"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="448"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="447"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="498"/> <source>Location</source> <translation>Местонахождение</translation> @@ -6374,89 +6405,89 @@ Existing Site</source> <translation>Оценка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="65"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="64"/> <location filename="../subsurface/desktop-widgets/ui_maintab.h" line="513"/> <source>Equipment</source> <translation>Снаряжение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="67"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="66"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="69"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="68"/> <source>Summary</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="71"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="70"/> <source>Media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="73"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="72"/> <source>Extra Info</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="75"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="74"/> <source>Dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="76"/> <source>Device names</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="109"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="113"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="112"/> <source>OK</source> <translation>OK</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="117"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="116"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="236"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="235"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="386"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="414"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="385"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="413"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="408"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="407"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="532"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="526"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="533"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="527"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="563"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="553"/> <source>Warning: edited %1 dives</source> <translation type="unfinished"/> </message> @@ -6494,478 +6525,478 @@ Existing Site</source> <context> <name>MainWindow</name> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="67"/> + <location filename="../desktop-widgets/mainwindow.ui" line="53"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="614"/> <source>&File</source> <translation>Файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="88"/> + <location filename="../desktop-widgets/mainwindow.ui" line="74"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="615"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="103"/> + <location filename="../desktop-widgets/mainwindow.ui" line="89"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="616"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="106"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="617"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="128"/> + <location filename="../desktop-widgets/mainwindow.ui" line="114"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="618"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="137"/> + <location filename="../desktop-widgets/mainwindow.ui" line="123"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="619"/> <source>&Edit</source> <translation>Редактирование</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="149"/> + <location filename="../desktop-widgets/mainwindow.ui" line="135"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="529"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="152"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="531"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="146"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="533"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="163"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="469"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="535"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> + <location filename="../desktop-widgets/mainwindow.ui" line="157"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="537"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="174"/> + <location filename="../desktop-widgets/mainwindow.ui" line="160"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="539"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="168"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="541"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="185"/> + <location filename="../desktop-widgets/mainwindow.ui" line="171"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="543"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="179"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="545"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="196"/> + <location filename="../desktop-widgets/mainwindow.ui" line="182"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="547"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="190"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="549"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="198"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="550"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="223"/> + <location filename="../desktop-widgets/mainwindow.ui" line="209"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="551"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="234"/> + <location filename="../desktop-widgets/mainwindow.ui" line="220"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="552"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="228"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="554"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="236"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="555"/> <source>&Copy dive components</source> <translation>Копировать параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="244"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="556"/> <source>&Paste dive components</source> <translation>Вставить параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="266"/> + <location filename="../desktop-widgets/mainwindow.ui" line="252"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="557"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="277"/> + <location filename="../desktop-widgets/mainwindow.ui" line="263"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="558"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="282"/> + <location filename="../desktop-widgets/mainwindow.ui" line="268"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="559"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="290"/> + <location filename="../desktop-widgets/mainwindow.ui" line="276"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="560"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="298"/> + <location filename="../desktop-widgets/mainwindow.ui" line="284"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="561"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="306"/> + <location filename="../desktop-widgets/mainwindow.ui" line="292"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="562"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="314"/> + <location filename="../desktop-widgets/mainwindow.ui" line="300"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="563"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="322"/> + <location filename="../desktop-widgets/mainwindow.ui" line="308"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="564"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="330"/> + <location filename="../desktop-widgets/mainwindow.ui" line="316"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="565"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="338"/> + <location filename="../desktop-widgets/mainwindow.ui" line="324"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="566"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="346"/> + <location filename="../desktop-widgets/mainwindow.ui" line="332"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="567"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="354"/> + <location filename="../desktop-widgets/mainwindow.ui" line="340"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="568"/> <source>&Map</source> <translation>&Карта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="362"/> + <location filename="../desktop-widgets/mainwindow.ui" line="348"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="569"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="370"/> + <location filename="../desktop-widgets/mainwindow.ui" line="356"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="570"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="373"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="572"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="381"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>&Import dive sites</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="384"/> + <location filename="../desktop-widgets/mainwindow.ui" line="370"/> <source>Import dive sites from other users</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="392"/> + <location filename="../desktop-widgets/mainwindow.ui" line="378"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="574"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="400"/> + <location filename="../desktop-widgets/mainwindow.ui" line="386"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="575"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="403"/> + <location filename="../desktop-widgets/mainwindow.ui" line="389"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="577"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="411"/> + <location filename="../desktop-widgets/mainwindow.ui" line="397"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="579"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="416"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="580"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="419"/> + <location filename="../desktop-widgets/mainwindow.ui" line="405"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="582"/> <source>Export dive logs</source> <translation>Экспорт </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="427"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Change settings on &dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="438"/> + <location filename="../desktop-widgets/mainwindow.ui" line="424"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="585"/> <source>Edit &dive in planner</source> <translation>Редактировать в планировщике</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="450"/> + <location filename="../desktop-widgets/mainwindow.ui" line="436"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="586"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="587"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="474"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="588"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="486"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="589"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="498"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="590"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="510"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="591"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="522"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="592"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="534"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="593"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="546"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="594"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="558"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="595"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="570"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="596"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="582"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="597"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="594"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="598"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="606"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="599"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="618"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="600"/> <source>Toggle media</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="630"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="601"/> <source>Toggle gas bar</source> <translation>Газы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="638"/> + <location filename="../desktop-widgets/mainwindow.ui" line="624"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="602"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="646"/> + <location filename="../desktop-widgets/mainwindow.ui" line="632"/> <source>Dive statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="661"/> + <location filename="../desktop-widgets/mainwindow.ui" line="647"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="603"/> <source>Toggle tissue heat-map</source> <translation>Насыщение тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="666"/> + <location filename="../desktop-widgets/mainwindow.ui" line="652"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="605"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="674"/> + <location filename="../desktop-widgets/mainwindow.ui" line="660"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="606"/> <source>&Redo</source> <translation>Повторить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="682"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="607"/> <source>&Find moved media files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="687"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="608"/> <source>Open c&loud storage</source> <translation>Открыть облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="695"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="609"/> <source>Save to clo&ud storage</source> <translation>Сохранить в облаке</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="700"/> + <location filename="../desktop-widgets/mainwindow.ui" line="686"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="610"/> <source>&Manage dive sites</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="705"/> + <location filename="../desktop-widgets/mainwindow.ui" line="691"/> <location filename="../subsurface/desktop-widgets/ui_mainwindow.h" line="611"/> <source>Dive Site &Edit</source> <translation>Редактирование дайв-сайта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="713"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Cloud stora&ge online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="725"/> - <location filename="../desktop-widgets/mainwindow.ui" line="728"/> + <location filename="../desktop-widgets/mainwindow.ui" line="711"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Toggle deco information</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="595"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="588"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="715"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="750"/> + <location filename="../desktop-widgets/divelistview.cpp" line="600"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="572"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="606"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="734"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="596"/> + <location filename="../desktop-widgets/divelistview.cpp" line="601"/> <source>Trying to merge dives with %1min interval in between</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="251"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="256"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="252"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="257"/> <source>The following backup printing templates were created: %1 @@ -6979,243 +7010,243 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="442"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="489"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="460"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="507"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1245"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="448"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="466"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="452"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="470"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1663"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="572"/> <source>Please save or cancel the current dive edit before going online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="566"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1114"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="584"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1090"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="567"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="585"/> <source>You have unsaved changes. Do you want to commit them to the cloud storage? If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="577"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="595"/> <source>Failure taking cloud storage online</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="708"/> <source>Please save or cancel the current dive edit before quiting the application.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="734"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="750"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="769"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="823"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="846"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1049"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="984"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1028"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1070"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1046"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1273"/> <source>Subsurface files</source> <translation>Файлы Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1071"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1005"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Cochran</source> <translation>Cochran</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1006"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1049"/> <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1031"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1074"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1007"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1050"/> <source>JDiveLog</source> <translation>JDiveLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1032"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1075"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1051"/> <source>Liquivision</source> <translation>Liquivision</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1033"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1076"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1052"/> <source>Suunto</source> <translation>Suunto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1034"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1077"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1053"/> <source>UDCF</source> <translation>UDCF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1035"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1078"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1011"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1054"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1036"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1079"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1012"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1055"/> <source>XML</source> <translation>XML</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1037"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1080"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1013"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1056"/> <source>Divesoft</source> <translation>Divesoft</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1038"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1081"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> <source>Datatrak/WLog</source> <translation>Datatrak/WLog</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1039"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1082"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1058"/> <source>MkVI files</source> <translation>Файлы MkVI</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1040"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1083"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1016"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1059"/> <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1041"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1084"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1017"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1060"/> <source>OSTCtools</source> <translation>OSTCtools</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1042"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1085"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1018"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> <source>DAN DL7</source> <translation>DAN DL7</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1072"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1048"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1086"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1098"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1074"/> <source>All files</source> <translation>Все файлы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1093"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Dive site files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1108"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1084"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1109"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1085"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1115"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1091"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1298"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1272"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1387"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1427"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1531"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1505"/> <source>multiple files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1429"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1430"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1480"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1507"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1481"/> <source>Open dive site file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1663"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -7343,74 +7374,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="463"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="457"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="466"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="458"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="467"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="459"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="461"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="462"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="471"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="463"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="472"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="464"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="473"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="476"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="477"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="468"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="469"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="485"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="486"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="477"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="478"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="487"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="492"/> <source>psi</source> <translation>psi</translation> </message> @@ -7418,7 +7449,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerWidgets</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="600"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="592"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> @@ -8626,32 +8657,32 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>PrintDialog</name> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="109"/> + <location filename="../desktop-widgets/printdialog.cpp" line="110"/> <source>P&rint</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="112"/> + <location filename="../desktop-widgets/printdialog.cpp" line="113"/> <source>&Preview</source> <translation>Просмотр</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="115"/> + <location filename="../desktop-widgets/printdialog.cpp" line="116"/> <source>Export Html</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="128"/> + <location filename="../desktop-widgets/printdialog.cpp" line="129"/> <source>Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="201"/> + <location filename="../desktop-widgets/printdialog.cpp" line="202"/> <source>Filename to export html to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printdialog.cpp" line="202"/> + <location filename="../desktop-widgets/printdialog.cpp" line="203"/> <source>Html file</source> <translation type="unfinished"/> </message> @@ -8784,138 +8815,138 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="784"/> + <location filename="../profile-widget/profilewidget2.cpp" line="746"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="786"/> + <location filename="../profile-widget/profilewidget2.cpp" line="748"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="788"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="792"/> + <location filename="../profile-widget/profilewidget2.cpp" line="754"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="817"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1364"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1385"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1367"/> <source>Split this dive computer into own dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1383"/> <source>Edit Gas Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1391"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1398"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1399"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1400"/> <source>Split dive into two</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1436"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1440"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1443"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1472"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1479"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1453"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1460"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1475"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1518"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1502"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1569"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1537"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1570"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1538"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1624"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1660"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1625"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1665"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1630"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -8948,162 +8979,162 @@ Please export this template to a different file.</source> <translation>Неверная облачная учетная запись</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="558"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="568"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="562"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="582"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="653"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="583"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="663"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="620"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="630"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="661"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="671"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="673"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="683"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="700"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="696"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="706"/> <source>Incorrect email / password combination</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="701"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="711"/> <source>Cloud credentials require verification PIN</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="704"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="714"/> <source>Incorrect PIN, please try again</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="709"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="719"/> <source>PIN accepted, credentials verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="718"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="728"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="763"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="773"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="811"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="821"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="831"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="841"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1016"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1017"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1026"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1027"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1016"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1017"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1018"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1026"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1027"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1028"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1016"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1026"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1135"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1145"/> <source>weight</source> <translation>вес</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1413"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1423"/> <source>[%1]Changes saved:'%2'. %1 possible via context menu</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1415"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1425"/> <source>Redo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1415"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1425"/> <source>Undo: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1427"/> <source>Undo</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1437"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1447"/> <source>Fatal error: cannot save data file. Please copy log file and report.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1638"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1648"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1863"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1873"/> <source>no default cylinder</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="2331"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="2341"/> <source>(unsaved changes in memory)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="2333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="2343"/> <source>(changes synced locally)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="2334"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="2344"/> <source>(synced with cloud)</source> <translation type="unfinished"/> </message> @@ -9117,13 +9148,13 @@ Please export this template to a different file.</source> </message> <message> <location filename="../core/fulltext.cpp" line="150"/> - <location filename="../qt-models/divetripmodel.cpp" line="713"/> + <location filename="../qt-models/divetripmodel.cpp" line="732"/> <source>start processing</source> <translation type="unfinished"/> </message> <message> <location filename="../core/fulltext.cpp" line="155"/> - <location filename="../qt-models/divetripmodel.cpp" line="744"/> + <location filename="../qt-models/divetripmodel.cpp" line="763"/> <source>%1 dives processed</source> <translation type="unfinished"/> </message> @@ -9133,7 +9164,7 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="712"/> + <location filename="../qt-models/divetripmodel.cpp" line="731"/> <source>populate data model</source> <translation type="unfinished"/> </message> @@ -9893,71 +9924,66 @@ Files with inappropriate date/time</source> <context> <name>StatsTranslations</name> <message> - <location filename="../stats/barseries.cpp" line="325"/> - <location filename="../stats/pieseries.cpp" line="204"/> + <location filename="../stats/barseries.cpp" line="347"/> + <location filename="../stats/pieseries.cpp" line="221"/> <source>%1 (%2 of %3) dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/barseries.cpp" line="340"/> + <location filename="../stats/barseries.cpp" line="363"/> <source>Count</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/boxseries.cpp" line="101"/> + <location filename="../stats/boxseries.cpp" line="105"/> <source>%1 (%2 dives)</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/boxseries.cpp" line="103"/> - <location filename="../stats/statsvariables.cpp" line="1057"/> - <location filename="../stats/statsvariables.cpp" line="1091"/> + <location filename="../stats/boxseries.cpp" line="107"/> + <location filename="../stats/statsvariables.cpp" line="1024"/> + <location filename="../stats/statsvariables.cpp" line="1058"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../stats/boxseries.cpp" line="104"/> + <location filename="../stats/boxseries.cpp" line="108"/> <source>Q1</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/boxseries.cpp" line="105"/> + <location filename="../stats/boxseries.cpp" line="109"/> <location filename="../stats/statsstate.cpp" line="368"/> <source>median</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/boxseries.cpp" line="106"/> + <location filename="../stats/boxseries.cpp" line="110"/> <source>Q3</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/boxseries.cpp" line="107"/> + <location filename="../stats/boxseries.cpp" line="111"/> <source>max</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/pieseries.cpp" line="147"/> + <location filename="../stats/pieseries.cpp" line="164"/> <source>other (%1 items)</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/pieseries.cpp" line="213"/> + <location filename="../stats/pieseries.cpp" line="230"/> <source>other</source> <translation>прочее</translation> </message> <message> - <location filename="../stats/scatterseries.cpp" line="136"/> - <source>Removed dive</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../stats/scatterseries.cpp" line="138"/> + <location filename="../stats/scatterseries.cpp" line="196"/> <source>Dive #%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/scatterseries.cpp" line="145"/> + <location filename="../stats/scatterseries.cpp" line="202"/> <source>and %1 more</source> <translation type="unfinished"/> </message> @@ -10106,244 +10132,244 @@ Files with inappropriate date/time</source> <translation>Максимум</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="742"/> - <location filename="../stats/statsvariables.cpp" line="1143"/> - <location filename="../stats/statsvariables.cpp" line="1350"/> + <location filename="../stats/statsvariables.cpp" line="729"/> + <location filename="../stats/statsvariables.cpp" line="1110"/> + <location filename="../stats/statsvariables.cpp" line="1317"/> <source>%1–%2</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="857"/> + <location filename="../stats/statsvariables.cpp" line="824"/> <source>Yearly</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="874"/> + <location filename="../stats/statsvariables.cpp" line="841"/> <source>Quarterly</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="878"/> + <location filename="../stats/statsvariables.cpp" line="845"/> <source>%1 Q%2</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="886"/> + <location filename="../stats/statsvariables.cpp" line="853"/> <source>Q%1</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="920"/> + <location filename="../stats/statsvariables.cpp" line="887"/> <source>Monthly</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="958"/> + <location filename="../stats/statsvariables.cpp" line="925"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="984"/> - <location filename="../stats/statsvariables.cpp" line="1211"/> - <location filename="../stats/statsvariables.cpp" line="1291"/> + <location filename="../stats/statsvariables.cpp" line="951"/> + <location filename="../stats/statsvariables.cpp" line="1178"/> + <location filename="../stats/statsvariables.cpp" line="1258"/> <source>in %1 %2 steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1030"/> + <location filename="../stats/statsvariables.cpp" line="997"/> <source>Max. Depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1042"/> + <location filename="../stats/statsvariables.cpp" line="1009"/> <source>Mean Depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1054"/> + <location filename="../stats/statsvariables.cpp" line="1021"/> <source>in %1 min steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1066"/> + <location filename="../stats/statsvariables.cpp" line="1033"/> <source>in hours</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1072"/> + <location filename="../stats/statsvariables.cpp" line="1039"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1088"/> + <location filename="../stats/statsvariables.cpp" line="1055"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1113"/> - <location filename="../stats/statsvariables.cpp" line="1137"/> + <location filename="../stats/statsvariables.cpp" line="1080"/> + <location filename="../stats/statsvariables.cpp" line="1104"/> <source>in %1 %2/min steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1117"/> - <location filename="../stats/statsvariables.cpp" line="1147"/> - <location filename="../stats/statsvariables.cpp" line="1176"/> + <location filename="../stats/statsvariables.cpp" line="1084"/> + <location filename="../stats/statsvariables.cpp" line="1114"/> + <location filename="../stats/statsvariables.cpp" line="1143"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1173"/> + <location filename="../stats/statsvariables.cpp" line="1140"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1263"/> + <location filename="../stats/statsvariables.cpp" line="1230"/> <source>Water temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1275"/> + <location filename="../stats/statsvariables.cpp" line="1242"/> <source>Air temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1314"/> + <location filename="../stats/statsvariables.cpp" line="1281"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1361"/> + <location filename="../stats/statsvariables.cpp" line="1328"/> <source>in %L2 steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1379"/> + <location filename="../stats/statsvariables.cpp" line="1346"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1411"/> + <location filename="../stats/statsvariables.cpp" line="1378"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1439"/> + <location filename="../stats/statsvariables.cpp" line="1406"/> <source>People</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1465"/> + <location filename="../stats/statsvariables.cpp" line="1432"/> <source>Buddies</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1487"/> + <location filename="../stats/statsvariables.cpp" line="1454"/> <source>Dive guides</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1511"/> + <location filename="../stats/statsvariables.cpp" line="1478"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1550"/> + <location filename="../stats/statsvariables.cpp" line="1517"/> <source>in %1% steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1570"/> + <location filename="../stats/statsvariables.cpp" line="1537"/> <source>Air</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1572"/> + <location filename="../stats/statsvariables.cpp" line="1539"/> <source>Oxygen</source> <translation>Кислород</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1574"/> + <location filename="../stats/statsvariables.cpp" line="1541"/> <source>EAN%1–%2</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1577"/> + <location filename="../stats/statsvariables.cpp" line="1544"/> <source>%1/%2–%3/%4</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1588"/> + <location filename="../stats/statsvariables.cpp" line="1555"/> <source>General</source> <translation>Общие</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1615"/> + <location filename="../stats/statsvariables.cpp" line="1582"/> <source>Gas type</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1671"/> + <location filename="../stats/statsvariables.cpp" line="1638"/> <source>In %L1% steps</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1721"/> + <location filename="../stats/statsvariables.cpp" line="1688"/> <source>O₂ (max)</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1730"/> + <location filename="../stats/statsvariables.cpp" line="1697"/> <source>O₂ (bottom gas)</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1739"/> + <location filename="../stats/statsvariables.cpp" line="1706"/> <source>He (max)</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1754"/> + <location filename="../stats/statsvariables.cpp" line="1721"/> <source>Suit type</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1784"/> + <location filename="../stats/statsvariables.cpp" line="1751"/> <source>Weightsystem</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1814"/> + <location filename="../stats/statsvariables.cpp" line="1781"/> <source>Cylinder type</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1840"/> + <location filename="../stats/statsvariables.cpp" line="1807"/> <source>Dive site</source> <translation>Дайв-сайт</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1864"/> + <location filename="../stats/statsvariables.cpp" line="1831"/> <source>Day of week</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1889"/> + <location filename="../stats/statsvariables.cpp" line="1856"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../stats/statsvariables.cpp" line="1915"/> + <location filename="../stats/statsvariables.cpp" line="1882"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../stats/statsview.cpp" line="486"/> + <location filename="../stats/statsview.cpp" line="626"/> <source>No. dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../stats/statsview.cpp" line="1160"/> + <location filename="../stats/statsview.cpp" line="1300"/> <source>%1 vs. %2</source> <translation type="unfinished"/> </message> @@ -10381,6 +10407,31 @@ Files with inappropriate date/time</source> <source>Chart</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/statswidget.ui" line="101"/> + <source>Restriction</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/statswidget.ui" line="110"/> + <source>Restrict to selection</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/statswidget.ui" line="117"/> + <source>Reset restriction</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/statswidget.cpp" line="154"/> + <source>Analyzing all dives</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/statswidget.cpp" line="156"/> + <source>Analyzing subset (%L1) dives</source> + <translation type="unfinished"/> + </message> </context> <context> <name>SubsurfaceAbout</name> @@ -11247,7 +11298,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="489"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="497"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -11255,7 +11306,7 @@ mixed from Air and using: <context> <name>ToolTipItem</name> <message> - <location filename="../profile-widget/divetooltipitem.cpp" line="136"/> + <location filename="../profile-widget/divetooltipitem.cpp" line="132"/> <source>Information</source> <translation>Информация</translation> </message> @@ -11722,8 +11773,8 @@ Maximum</source> <context> <name>gettextFromC</name> <message> - <location filename="../backend-shared/exportfuncs.cpp" line="232"/> - <location filename="../backend-shared/exportfuncs.cpp" line="270"/> + <location filename="../backend-shared/exportfuncs.cpp" line="251"/> + <location filename="../backend-shared/exportfuncs.cpp" line="289"/> <location filename="../core/save-html.c" line="490"/> <location filename="../core/save-html.c" line="579"/> <location filename="../core/worldmap-save.c" line="117"/> @@ -12048,10 +12099,10 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/divelist.c" line="621"/> + <location filename="../core/divelist.c" line="640"/> <location filename="../core/equipment.c" line="201"/> - <location filename="../core/planner.c" line="1153"/> - <location filename="../core/planner.c" line="1156"/> + <location filename="../core/planner.c" line="1169"/> + <location filename="../core/planner.c" line="1172"/> <source>air</source> <translation>воздух</translation> </message> @@ -12059,7 +12110,7 @@ Maximum</source> <location filename="../core/divelogexportlogic.cpp" line="57"/> <location filename="../core/divelogexportlogic.cpp" line="95"/> <location filename="../core/string-format.cpp" line="234"/> - <location filename="../desktop-widgets/templatelayout.cpp" line="475"/> + <location filename="../desktop-widgets/templatelayout.cpp" line="464"/> <location filename="../qt-models/divetripmodel.cpp" line="160"/> <source>h</source> <translation>ч</translation> @@ -12071,7 +12122,7 @@ Maximum</source> <location filename="../core/plannernotes.c" line="523"/> <location filename="../core/string-format.cpp" line="234"/> <location filename="../core/worldmap-save.c" line="50"/> - <location filename="../desktop-widgets/templatelayout.cpp" line="476"/> + <location filename="../desktop-widgets/templatelayout.cpp" line="465"/> <location filename="../qt-models/divetripmodel.cpp" line="160"/> <source>min</source> <translation>мин</translation> @@ -12080,7 +12131,7 @@ Maximum</source> <location filename="../core/divelogexportlogic.cpp" line="57"/> <location filename="../core/divelogexportlogic.cpp" line="95"/> <location filename="../core/qthelper.h" line="79"/> - <location filename="../desktop-widgets/templatelayout.cpp" line="476"/> + <location filename="../desktop-widgets/templatelayout.cpp" line="465"/> <source>sec</source> <translation>с</translation> </message> @@ -12113,8 +12164,8 @@ Maximum</source> <message> <location filename="../core/equipment.c" line="86"/> <location filename="../core/equipment.c" line="205"/> - <location filename="../core/planner.c" line="1157"/> - <location filename="../core/planner.c" line="1160"/> + <location filename="../core/planner.c" line="1173"/> + <location filename="../core/planner.c" line="1176"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -12165,7 +12216,7 @@ Maximum</source> <translation>Невозможно открыть CSV-файл %s; воспользуйтесь функцией Импорт</translation> </message> <message> - <location filename="../core/file.c" line="335"/> + <location filename="../core/file.c" line="331"/> <location filename="../core/import-csv.c" line="124"/> <location filename="../core/import-csv.c" line="348"/> <location filename="../core/import-csv.c" line="511"/> @@ -12175,7 +12226,7 @@ Maximum</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../core/file.c" line="337"/> + <location filename="../core/file.c" line="333"/> <source>Empty file '%s'</source> <translation>Пустой файл '%s'</translation> </message> @@ -12402,32 +12453,32 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="158"/> + <location filename="../core/gas.c" line="165"/> <source>Air</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="159"/> + <location filename="../core/gas.c" line="166"/> <source>Nitrox</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="160"/> + <location filename="../core/gas.c" line="167"/> <source>Hypoxic Trimix</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="161"/> + <location filename="../core/gas.c" line="168"/> <source>Normoxic Trimix</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="162"/> + <location filename="../core/gas.c" line="169"/> <source>Hyperoxic Trimix</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/gas.c" line="163"/> + <location filename="../core/gas.c" line="170"/> <source>Oxygen</source> <translation>Кислород</translation> </message> @@ -12447,108 +12498,108 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="166"/> + <location filename="../core/git-access.c" line="177"/> <source>Local cache directory %s corrupted - can't sync with Subsurface cloud storage</source> <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation> </message> <message> - <location filename="../core/git-access.c" line="190"/> - <location filename="../core/git-access.c" line="212"/> + <location filename="../core/git-access.c" line="201"/> + <location filename="../core/git-access.c" line="223"/> <source>Could not update local cache to newer remote data</source> <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation> </message> <message> - <location filename="../core/git-access.c" line="204"/> + <location filename="../core/git-access.c" line="215"/> <source>Subsurface cloud storage corrupted</source> <translation>Облачное хранилице поверждено</translation> </message> <message> - <location filename="../core/git-access.c" line="338"/> + <location filename="../core/git-access.c" line="350"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation> </message> <message> - <location filename="../core/git-access.c" line="395"/> + <location filename="../core/git-access.c" line="407"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="425"/> + <location filename="../core/git-access.c" line="437"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation> </message> <message> - <location filename="../core/git-access.c" line="462"/> + <location filename="../core/git-access.c" line="474"/> <source>Remote storage and local data diverged</source> <translation>Данные в локальном и облачном хранилице отличаются</translation> </message> <message> - <location filename="../core/git-access.c" line="466"/> + <location filename="../core/git-access.c" line="478"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="476"/> + <location filename="../core/git-access.c" line="488"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Проблема с локальным кэшем облачного хранилища</translation> </message> <message> - <location filename="../core/git-access.c" line="477"/> + <location filename="../core/git-access.c" line="489"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation> </message> <message> - <location filename="../core/git-access.c" line="533"/> + <location filename="../core/git-access.c" line="545"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="541"/> + <location filename="../core/git-access.c" line="553"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="561"/> + <location filename="../core/git-access.c" line="573"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="605"/> + <location filename="../core/git-access.c" line="617"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="681"/> + <location filename="../core/git-access.c" line="693"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="711"/> + <location filename="../core/git-access.c" line="725"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="724"/> + <location filename="../core/git-access.c" line="739"/> <source>Successful cloud connection, fetch remote</source> <translation>Успешное соединение с облаком, получение данных</translation> </message> <message> - <location filename="../core/git-access.c" line="741"/> + <location filename="../core/git-access.c" line="756"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="899"/> + <location filename="../core/git-access.c" line="919"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="902"/> + <location filename="../core/git-access.c" line="922"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="928"/> + <location filename="../core/git-access.c" line="948"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -12813,7 +12864,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="187"/> + <location filename="../core/load-git.c" line="186"/> <location filename="../core/parse-xml.c" line="1208"/> <source>multiple GPS locations for this dive site; also %s </source> @@ -12821,7 +12872,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="212"/> + <location filename="../core/load-git.c" line="211"/> <location filename="../core/parse.c" line="500"/> <source>additional name for site: %s </source> @@ -12829,12 +12880,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1859"/> + <location filename="../core/load-git.c" line="1858"/> <source>Load dives from local cache</source> <translation>Загрузить погружения из локального кэша</translation> </message> <message> - <location filename="../core/load-git.c" line="1863"/> + <location filename="../core/load-git.c" line="1862"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -12867,12 +12918,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../core/planner.c" line="880"/> + <location filename="../core/planner.c" line="892"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1161"/> + <location filename="../core/planner.c" line="1177"/> <source>ean</source> <translation>ean</translation> </message> @@ -13159,12 +13210,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/profile.c" line="1119"/> + <location filename="../core/profile.c" line="1120"/> <source>planned waypoint above ceiling</source> <translation>путевая точка выше потолка</translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1422"/> <source>@: %d:%02d D: %.1f%s </source> @@ -13173,74 +13224,74 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1429"/> <source>P: %d%s (%s) </source> <translation>Д: %d%s (%s) </translation> </message> <message> - <location filename="../core/profile.c" line="1431"/> + <location filename="../core/profile.c" line="1433"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1439"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1442"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1442"/> + <location filename="../core/profile.c" line="1444"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1444"/> + <location filename="../core/profile.c" line="1446"/> <source>pO₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1446"/> + <location filename="../core/profile.c" line="1448"/> <source>SCR ΔpO₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1449"/> + <location filename="../core/profile.c" line="1451"/> <source>pN₂: %.2fbar </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1451"/> + <location filename="../core/profile.c" line="1453"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1454"/> + <location filename="../core/profile.c" line="1456"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1463"/> + <location filename="../core/profile.c" line="1465"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -13249,7 +13300,7 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1469"/> + <location filename="../core/profile.c" line="1471"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> @@ -13258,210 +13309,209 @@ EADD: %d%s / %.1fг/л </translation> </message> <message> - <location filename="../core/profile.c" line="1474"/> + <location filename="../core/profile.c" line="1476"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1486"/> + <location filename="../core/profile.c" line="1488"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1489"/> + <location filename="../core/profile.c" line="1491"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1494"/> + <location filename="../core/profile.c" line="1496"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1497"/> + <location filename="../core/profile.c" line="1499"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1501"/> + <location filename="../core/profile.c" line="1503"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1503"/> + <location filename="../core/profile.c" line="1505"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1506"/> + <location filename="../core/profile.c" line="1508"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1509"/> + <location filename="../core/profile.c" line="1511"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1517"/> + <location filename="../core/profile.c" line="1519"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1520"/> + <location filename="../core/profile.c" line="1522"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1522"/> + <location filename="../core/profile.c" line="1524"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1526"/> + <location filename="../core/profile.c" line="1528"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1528"/> + <location filename="../core/profile.c" line="1530"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1531"/> + <location filename="../core/profile.c" line="1533"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1534"/> + <location filename="../core/profile.c" line="1536"/> <source>GF %d%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1538"/> <source>Surface GF %.0f%% </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1539"/> - <source>Calculated ceiling %.0f%s + <location filename="../core/profile.c" line="1541"/> + <source>Calculated ceiling %.1f%s </source> - <translation>Расчетный потолок %.0f%s -</translation> + <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1545"/> + <location filename="../core/profile.c" line="1547"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1554"/> <source>ICD in leading tissue </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1554"/> + <location filename="../core/profile.c" line="1556"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1558"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1559"/> + <location filename="../core/profile.c" line="1561"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1655"/> + <location filename="../core/profile.c" line="1657"/> <source>ΔT:%d:%02dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1659"/> + <location filename="../core/profile.c" line="1661"/> <source>%s ΔD:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1663"/> + <location filename="../core/profile.c" line="1665"/> <source>%s ↓D:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1667"/> + <location filename="../core/profile.c" line="1669"/> <source>%s ↑D:%.1f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1671"/> + <location filename="../core/profile.c" line="1673"/> <source>%s øD:%.1f%s </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1675"/> + <location filename="../core/profile.c" line="1677"/> <source>%s ↓V:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1679"/> + <location filename="../core/profile.c" line="1681"/> <source>%s ↑V:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1683"/> + <location filename="../core/profile.c" line="1685"/> <source>%s øV:%.2f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1690"/> + <location filename="../core/profile.c" line="1692"/> <source>%s ΔP:%d%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1715"/> + <location filename="../core/profile.c" line="1717"/> <source>%s SAC:%.*f%s/min</source> <translation>%s SAC:%.*f%s/мин</translation> </message> @@ -14436,7 +14486,17 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Заметки:</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> + <source>Exporting...</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/> + <source>Cancel</source> + <translation>Отмена</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="532"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> @@ -14481,7 +14541,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Удалить эту точку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1348"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1329"/> <source>Cyl</source> <translation>Баллон</translation> </message> @@ -14585,9 +14645,9 @@ Is the Uemis Zurich plugged in correctly?</source> </message> <message> <location filename="../mobile-widgets/qml/main.qml" line="307"/> - <location filename="../mobile-widgets/qml/main.qml" line="416"/> - <location filename="../mobile-widgets/qml/main.qml" line="499"/> - <location filename="../mobile-widgets/qml/main.qml" line="557"/> + <location filename="../mobile-widgets/qml/main.qml" line="417"/> + <location filename="../mobile-widgets/qml/main.qml" line="500"/> + <location filename="../mobile-widgets/qml/main.qml" line="558"/> <source>Back</source> <translation>Назад</translation> </message> @@ -14612,173 +14672,184 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="371"/> + <location filename="../mobile-widgets/qml/main.qml" line="364"/> + <source>Completed manual sync with cloud +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="372"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="371"/> + <location filename="../mobile-widgets/qml/main.qml" line="372"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="377"/> + <location filename="../mobile-widgets/qml/main.qml" line="378"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="387"/> + <location filename="../mobile-widgets/qml/main.qml" line="388"/> <source>Dive summary</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="398"/> + <location filename="../mobile-widgets/qml/main.qml" line="399"/> <source>Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="410"/> + <location filename="../mobile-widgets/qml/main.qml" line="411"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="432"/> + <location filename="../mobile-widgets/qml/main.qml" line="433"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="445"/> + <location filename="../mobile-widgets/qml/main.qml" line="446"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="456"/> + <location filename="../mobile-widgets/qml/main.qml" line="457"/> <source>Disable background location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="456"/> + <location filename="../mobile-widgets/qml/main.qml" line="457"/> <source>Run background location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="472"/> + <location filename="../mobile-widgets/qml/main.qml" line="473"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="481"/> + <location filename="../mobile-widgets/qml/main.qml" line="482"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="494"/> + <location filename="../mobile-widgets/qml/main.qml" line="495"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="506"/> + <location filename="../mobile-widgets/qml/main.qml" line="507"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="517"/> + <location filename="../mobile-widgets/qml/main.qml" line="518"/> <source>Show user manual</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="526"/> + <location filename="../mobile-widgets/qml/main.qml" line="527"/> <source>Ask for support</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="530"/> + <location filename="../mobile-widgets/qml/main.qml" line="531"/> <source>failed to open email client, please manually create support email to support@subsurface-divelog.org - the logs have been copied to the clipboard and can be pasted into that email.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="540"/> + <location filename="../mobile-widgets/qml/main.qml" line="541"/> <source>Reset forgotten Subsurface Cloud password</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="551"/> + <location filename="../mobile-widgets/qml/main.qml" line="552"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="561"/> + <location filename="../mobile-widgets/qml/main.qml" line="562"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="568"/> + <location filename="../mobile-widgets/qml/main.qml" line="569"/> <source>Test busy indicator (toggle)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="578"/> - <location filename="../mobile-widgets/qml/main.qml" line="580"/> + <location filename="../mobile-widgets/qml/main.qml" line="579"/> + <location filename="../mobile-widgets/qml/main.qml" line="581"/> <source>Test notification text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="584"/> + <location filename="../mobile-widgets/qml/main.qml" line="585"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="592"/> + <location filename="../mobile-widgets/qml/main.qml" line="593"/> <source>Enable verbose logging (currently: %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="594"/> + <location filename="../mobile-widgets/qml/main.qml" line="595"/> <source>Not persistent</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="601"/> + <location filename="../mobile-widgets/qml/main.qml" line="602"/> <source>Access local cloud cache dirs</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="660"/> + <location filename="../mobile-widgets/qml/main.qml" line="610"/> + <source>Copy GPS to clipboard</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="670"/> <source>Background location service active</source> <translation>Фоновая служба активна</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="697"/> + <location filename="../mobile-widgets/qml/main.qml" line="707"/> <source>Font size likely too big for the display, switching to smaller font suggested</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="861"/> + <location filename="../mobile-widgets/qml/main.qml" line="871"/> <source>Location Service Enabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="867"/> + <location filename="../mobile-widgets/qml/main.qml" line="877"/> <source>This service collects location data to enable you to track the GPS coordinates of your dives. This will attempt to continue to collect location data, even if the app is closed or your phone screen locked.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="874"/> + <location filename="../mobile-widgets/qml/main.qml" line="884"/> <source>The location data are not used in any way, except when you apply the location data to the dives in your dive list on this device.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="880"/> + <location filename="../mobile-widgets/qml/main.qml" line="890"/> <source>By default, the location data are never transferred to the cloud or to any other service. However, in order to allow debugging of location data related issues, you can explicitly enable storing those location data in the cloud by enabling the corresponding option in the advanced settings.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="885"/> + <location filename="../mobile-widgets/qml/main.qml" line="895"/> <source>Understood</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="895"/> + <location filename="../mobile-widgets/qml/main.qml" line="905"/> <source>Subsurface-mobile starting up</source> <translation type="unfinished"/> </message> |