summaryrefslogtreecommitdiffstats
path: root/translations/subsurface_ru_RU.ts
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
committerGravatar Dirk Hohndel <dirk@hohndel.org>2016-12-12 09:25:32 +0900
commitc7cadab27cd09392d60763178276647c923d752c (patch)
tree733e82067ae4162a942837a7615991dcfb4acd10 /translations/subsurface_ru_RU.ts
parentb01722e8154626d44dc8425d35e7b8245c9ac11c (diff)
downloadsubsurface-c7cadab27cd09392d60763178276647c923d752c.tar.gz
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
-rw-r--r--translations/subsurface_ru_RU.ts6729
1 files changed, 3399 insertions, 3330 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts
index a95df73d2..3594f3164 100644
--- a/translations/subsurface_ru_RU.ts
+++ b/translations/subsurface_ru_RU.ts
@@ -105,6 +105,11 @@
<translation>Название:</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
+ <source>Could not initialize Winsock version 2.2</source>
+ <translation>Ошибка инициализации Winsock 2.2</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="134"/>
<source>Trying to turn on the local Bluetooth device...</source>
<translation>Включение локального устройства Bluetooth...</translation>
@@ -115,6 +120,11 @@
<translation>Выключение локального устройства Bluetooth...</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
+ <source>Remote devices list was cleared.</source>
+ <translation>Список удаленных устройств очищен.</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="183"/>
<source>Scanning for remote devices...</source>
<translation>Сканирование устройств...</translation>
@@ -125,6 +135,22 @@
<translation>Сканирование завершено.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
+ <source>The local Bluetooth device was %1.</source>
+ <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
+ <translation>Локальное устройство Bluetooth было %1.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned on</source>
+ <translation>включено</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
+ <source>turned off</source>
+ <translation>выключено</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="225"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/>
@@ -172,37 +198,6 @@
<translation>Сопряжение</translation>
</message>
<message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
- <source>Device %1 was paired and is authorized.</source>
- <translation>Устройство %1 авторизовано и сопряжено.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="56"/>
- <source>Could not initialize Winsock version 2.2</source>
- <translation>Ошибка инициализации Winsock 2.2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="167"/>
- <source>Remote devices list was cleared.</source>
- <translation>Список удаленных устройств очищен.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="208"/>
- <source>The local Bluetooth device was %1.</source>
- <extracomment>%1 will be replaced with &quot;turned on&quot; or &quot;turned off&quot;</extracomment>
- <translation>Локальное устройство Bluetooth было %1.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned on</source>
- <translation>включено</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="209"/>
- <source>turned off</source>
- <translation>выключено</translation>
- </message>
- <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="307"/>
<source>Remove pairing</source>
<translation>Удалить сопряжение</translation>
@@ -228,6 +223,11 @@
<translation>Устройство %1 сопряжено.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="352"/>
+ <source>Device %1 was paired and is authorized.</source>
+ <translation>Устройство %1 авторизовано и сопряжено.</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/>
<source>The device %1 can now be used for connection. You can press the Save button.</source>
<translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation>
@@ -286,12 +286,12 @@
<context>
<name>BuddyFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="621"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="619"/>
<source>Person: </source>
<translation>Люди:</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="622"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="620"/>
<source>Searches for buddies and divemasters</source>
<translation>Поиск партнеров и инструкторов</translation>
</message>
@@ -299,7 +299,7 @@
<context>
<name>BuddyFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="243"/>
+ <location filename="../qt-models/filtermodels.cpp" line="248"/>
<source>No buddies</source>
<translation>Без напарника</translation>
</message>
@@ -307,25 +307,30 @@
<context>
<name>CloudCredentials</name>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="49"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="50"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="55"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="56"/>
<source>Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="68"/>
<source>Password</source>
<translation>Пароль</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="90"/>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="92"/>
<source>Show password</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/CloudCredentials.qml" line="97"/>
+ <source>PIN</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>ColumnNameProvider</name>
@@ -381,6 +386,16 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Max. depth</source>
+ <translation>Макс. глубина</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Avg. depth</source>
+ <translation>Сред. глубина</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Divemaster</source>
<translation>Инструктор</translation>
</message>
@@ -391,6 +406,11 @@
</message>
<message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
+ <source>Suit</source>
+ <translation>Костюм</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
@@ -410,21 +430,6 @@
<translation>Темп. воды</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Max. depth</source>
- <translation>Макс. глубина</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Avg. depth</source>
- <translation>Сред. глубина</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="43"/>
- <source>Suit</source>
- <translation>Костюм</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.cpp" line="44"/>
<source>O₂</source>
<translation>O₂</translation>
@@ -538,7 +543,7 @@
<translation>Невозможно создать контекст libdivecomputer</translation>
</message>
<message>
- <location filename="../core/configuredivecomputer.cpp" line="660"/>
+ <location filename="../core/configuredivecomputer.cpp" line="656"/>
<source>Could not a establish connection to the dive computer.</source>
<translation>Невозможно установить соединение с дайвкомпьютером.</translation>
</message>
@@ -558,11 +563,19 @@
<translation>Устройство или точка монтирования</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
- <source>...</source>
- <translation>...</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
+ <source>Connect via Bluetooth</source>
+ <translation>Bluetooth</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
+ <source>Connect</source>
+ <translation>Подключить</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
+ <source>Disconnect</source>
+ <translation>Отключить</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="80"/>
@@ -571,12 +584,24 @@
<translation>Загрузить настройки</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
+ <source>Read settings from backup file or from device before writing to the device</source>
+ <translation>Загрузить настройки из резервной копии или устройства перед сохранением в устройство</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="93"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1525"/>
<source>Save changes to device</source>
<translation>Сохранить в устройстве</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
+ <source>Read settings from backup file or from device before writing to a backup file</source>
+ <translation>Загрузить настройки из резервной копии или устройства перед сохранением в резервный файл</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="119"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1529"/>
<source>Backup</source>
@@ -595,15 +620,40 @@
<translation>Обновить прошивку</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation>Сохранить журнал libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="170"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1520"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1533"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="177"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1534"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
- <source>OSTC 3</source>
- <translation>OSTC 3</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
+ <source>OSTC 3,Sport,Cr,2</source>
+ <translation>OSTC 3,Sport,Cr,2</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
+ <source>Suunto Vyper family</source>
+ <translation>Семейство Suunto Vyper</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
+ <source>OSTC, Mk.2/2N/2C</source>
+ <translation>OSTC, Mk.2/2N/2C</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="253"/>
@@ -616,40 +666,56 @@
<translation>Основное</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
- <source>Serial No.</source>
- <translation>Серийный #</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
+ <source>Eco</source>
+ <translation>Эко</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
- <source>Firmware version</source>
- <translation>Прошивка</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
+ <source>Medium</source>
+ <translation>Средняя</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
- <source>Custom text</source>
- <translation>Свой текст</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
+ <source>High</source>
+ <translation>Высокая</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
- <source>Language</source>
- <translation>Язык</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
+ <source>%</source>
+ <translation>%</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="289"/>
@@ -676,44 +742,36 @@
<translation>Итальянский</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
- <source>Dive mode</source>
- <translation>Режим</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
- <source>OC</source>
- <translation>Откр. цикл</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
- <source>CC</source>
- <translation>Закр. цикл</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
+ <source>m/°C</source>
+ <translation>м/°C</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
- <source>Gauge</source>
- <translation>Измеритель</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
+ <source>ft/°F</source>
+ <translation>фут/°F</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
- <source>Apnea</source>
- <translation>Апноэ</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="326"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1656"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1943"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1546"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1726"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1766"/>
+ <source>Serial No.</source>
+ <translation>Серийный #</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
- <source>Date format</source>
- <translation>Формат даты</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="349"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1679"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1980"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1547"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1727"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1767"/>
+ <source>Firmware version</source>
+ <translation>Прошивка</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="360"/>
@@ -734,108 +792,147 @@
<translation>ГГММДД</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
- <source>Saturation</source>
- <translation>Насыщение</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="385"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1549"/>
+ <source>Language</source>
+ <translation>Язык</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="826"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="849"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="875"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="927"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="993"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1019"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1101"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1117"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1450"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2278"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2382"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2408"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2434"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2474"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2497"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1586"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1621"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1623"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1625"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1628"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1637"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1638"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1710"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1785"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1789"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1801"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1803"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1806"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1807"/>
- <source>%</source>
- <translation>%</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="395"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2063"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1565"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1780"/>
+ <source>Date format</source>
+ <translation>Формат даты</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
- <source>Desaturation</source>
- <translation>Рассыщение</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
+ <source>Brightness</source>
+ <translation>Яркость</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
- <source>Last deco</source>
- <translation>Последнее деко</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
+ <source>Units</source>
+ <translation>Единицы</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
- <source> m</source>
- <translation>м</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
+ <source>Salinity (0-5%)</source>
+ <translation>Соленость (0-5%)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="405"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1572"/>
- <source>Brightness</source>
- <translation>Яркость</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
+ <source>Reset device to default settings</source>
+ <translation>Сбросить в заводские установки</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="260"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1575"/>
- <source>Eco</source>
- <translation>Эко</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
+ <source>230LSB/Gauss</source>
+ <translation>230LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="265"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1576"/>
- <source>Medium</source>
- <translation>Средняя</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
+ <source>330LSB/Gauss</source>
+ <translation>330LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="270"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1577"/>
- <source>High</source>
- <translation>Высокая</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
+ <source>390LSB/Gauss</source>
+ <translation>390LSB/Gauss</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
- <source>Sampling rate</source>
- <translation>Дискретизация</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
+ <source>440LSB/Gauss</source>
+ <translation>440LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
+ <source>660LSB/Gauss</source>
+ <translation>660LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
+ <source>820LSB/Gauss</source>
+ <translation>820LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
+ <source>1090LSB/Gauss</source>
+ <translation>1090LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
+ <source>1370LSB/Gauss</source>
+ <translation>1370LSB/Gauss</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
+ <source>Compass gain</source>
+ <translation>Поправка компаса</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
+ <source>Computer model</source>
+ <translation>Модель</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="538"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1713"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1990"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1548"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1729"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1768"/>
+ <source>Custom text</source>
+ <translation>Свой текст</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="556"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1560"/>
+ <source>OC</source>
+ <translation>Откр. цикл</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="561"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1561"/>
+ <source>CC</source>
+ <translation>Закр. цикл</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="566"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2336"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1562"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1793"/>
+ <source>Gauge</source>
+ <translation>Измеритель</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="571"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1563"/>
+ <source>Apnea</source>
+ <translation>Апноэ</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="579"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1557"/>
+ <source>Dive mode</source>
+ <translation>Режим</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="590"/>
@@ -852,30 +949,12 @@
<translation>10с</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="415"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1850"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1579"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1753"/>
- <source>Units</source>
- <translation>Единицы</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="313"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1582"/>
- <source>m/°C</source>
- <translation>м/°C</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="318"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1583"/>
- <source>ft/°F</source>
- <translation>фут/°F</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
- <source>Dive mode color</source>
- <translation>Цвет режима</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="603"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2034"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1599"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1779"/>
+ <source>Sampling rate</source>
+ <translation>Дискретизация</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="614"/>
@@ -902,12 +981,6 @@
<translation>Синий</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="425"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1585"/>
- <source>Salinity (0-5%)</source>
- <translation>Соленость (0-5%)</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="637"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2092"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1613"/>
@@ -916,90 +989,80 @@
<translation>Синхронизировать время с ПК</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="521"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1587"/>
- <source>Compass gain</source>
- <translation>Поправка компаса</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="90"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1523"/>
- <source>Read settings from backup file or from device before writing to the device</source>
- <translation>Загрузить настройки из резервной копии или устройства перед сохранением в устройство</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="116"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1527"/>
- <source>Read settings from backup file or from device before writing to a backup file</source>
- <translation>Загрузить настройки из резервной копии или устройства перед сохранением в резервный файл</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="232"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1543"/>
- <source>OSTC, Mk.2/2N/2C</source>
- <translation>OSTC, Mk.2/2N/2C</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="644"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1605"/>
+ <source>Dive mode color</source>
+ <translation>Цвет режима</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="452"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1590"/>
- <source>230LSB/Gauss</source>
- <translation>230LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
+ <source>Show safety stop</source>
+ <translation>Остановка безопасности</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="457"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1591"/>
- <source>330LSB/Gauss</source>
- <translation>330LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
+ <source>End Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="462"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1592"/>
- <source>390LSB/Gauss</source>
- <translation>390LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
+ <source> s</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="467"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1593"/>
- <source>440LSB/Gauss</source>
- <translation>440LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
+ <source>Length</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="472"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1594"/>
- <source>660LSB/Gauss</source>
- <translation>660LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
+ <source>Start Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="477"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1595"/>
- <source>820LSB/Gauss</source>
- <translation>820LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
+ <source>Reset Depth</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="482"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1596"/>
- <source>1090LSB/Gauss</source>
- <translation>1090LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="711"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="736"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="758"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="904"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2181"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2206"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2228"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2307"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1626"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1786"/>
+ <source> m</source>
+ <translation>м</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="487"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1597"/>
- <source>1370LSB/Gauss</source>
- <translation>1370LSB/Gauss</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
+ <source>Advanced settings</source>
+ <translation>Дополнительно</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="654"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2020"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1614"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1771"/>
- <source>Show safety stop</source>
- <translation>Остановка безопасности</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
+ <source>Left button sensitivity</source>
+ <translation>Чувствительность левой кнопки</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="438"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1615"/>
- <source>Reset device to default settings</source>
- <translation>Сбросить в заводские установки</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
+ <source>Always show ppO2</source>
+ <translation>Всегда показывать ppO2</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="798"/>
@@ -1010,20 +1073,6 @@
<translation>Альтернативный GF под водой</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="223"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1541"/>
- <source>Suunto Vyper family</source>
- <translation>Семейство Suunto Vyper</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="778"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2248"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1643"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1810"/>
- <source>Advanced settings</source>
- <translation>Дополнительно</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="805"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2271"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1618"/>
@@ -1054,6 +1103,14 @@
<translation>GFHigh</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="865"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2261"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1624"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1784"/>
+ <source>Desaturation</source>
+ <translation>Рассыщение</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="917"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2320"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1627"/>
@@ -1068,14 +1125,6 @@
<translation>мбар</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
- <source> min</source>
- <translation>мин</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="960"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2331"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1633"/>
@@ -1084,63 +1133,28 @@
<translation>ZH-L16</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="47"/>
- <source>Connect via Bluetooth</source>
- <translation>Bluetooth</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="163"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1532"/>
- <source>Save libdivecomputer logfile</source>
- <translation>Сохранить журнал libdivecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="661"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2145"/>
- <source>End Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="671"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2162"/>
- <source> s</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="687"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1953"/>
- <source>Length</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="694"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2138"/>
- <source>Start Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="701"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2152"/>
- <source>Reset Depth</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="784"/>
- <source>Left button sensitivity</source>
- <translation>Чувствительность левой кнопки</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="791"/>
- <source>Always show ppO2</source>
- <translation>Всегда показывать ppO2</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="965"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1634"/>
<source>ZH-L16+GF</source>
<translation>ZH-L16+GF</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="973"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2369"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1630"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1788"/>
+ <source> min</source>
+ <translation>мин</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="983"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2398"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1636"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1800"/>
+ <source>Last deco</source>
+ <translation>Последнее деко</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1009"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2424"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1640"/>
@@ -1157,6 +1171,14 @@
<translation>Альт. GFHigh</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1042"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2457"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1639"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1805"/>
+ <source>Saturation</source>
+ <translation>Насыщение</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1052"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1642"/>
<source>Flip screen</source>
@@ -1168,12 +1190,22 @@
<translation>Чувствительность правой кнопки</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
+ <source>MOD warning</source>
+ <translation>Предупреждение MOD</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1073"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2513"/>
<source>Graphical speed indicator</source>
<translation>Графический индикатор скорости</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
+ <source>Dynamic ascent rate</source>
+ <translation>Динамическая скорость подъема</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1087"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2552"/>
<source>Bottom gas consumption</source>
@@ -1186,6 +1218,14 @@
<translation>Расход деко-газа</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
+ <source> ℓ/min</source>
+ <translation>л/мин</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1165"/>
<source>Temperature sensor offset</source>
<translation type="unfinished"/>
@@ -1204,6 +1244,18 @@
<translation>Газы</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
+ <source>%O₂</source>
+ <translation>%O₂</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1240"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1325"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2615"/>
@@ -1322,16 +1374,10 @@
<translation>Дил 5</translation>
</message>
<message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
- <source>Set point [cbar]</source>
- <translation>Установка [сбар]</translation>
- </message>
- <message>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
- <source>Change depth [m]</source>
- <translation>Замена на [м]</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
+ <source>Setpoint</source>
+ <translation>Установка</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1415"/>
@@ -1370,6 +1416,12 @@
<translation>SP 5</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
+ <source>O₂ in calibration gas</source>
+ <translation>O₂ в калибровочном газе</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1467"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1713"/>
<source>Fixed setpoint</source>
@@ -1400,101 +1452,6 @@
<translation>сбар</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
- <source>P1 (medium)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation>P1 (средний)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
- <source>P2 (high)</source>
- <extracomment>Suunto safety level</extracomment>
- <translation>P2 (высокий)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
- <source>Total dive time</source>
- <translation>Общее время</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
- <source>kg/ℓ</source>
- <translation>кг/л</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
- <source>Apnoea</source>
- <translation>Апноэ</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
- <source>Safety level</source>
- <translation>Уровень безопасности</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="54"/>
- <source>Connect</source>
- <translation>Подключить</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="64"/>
- <source>Disconnect</source>
- <translation>Отключить</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="214"/>
- <source>OSTC 3,Sport,Cr,2</source>
- <translation>OSTC 3,Sport,Cr,2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1066"/>
- <source>MOD warning</source>
- <translation>Предупреждение MOD</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1080"/>
- <source>Dynamic ascent rate</source>
- <translation>Динамическая скорость подъема</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1133"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1149"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2520"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2536"/>
- <source> ℓ/min</source>
- <translation>л/мин</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1235"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1320"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2610"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2695"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1645"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1668"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1812"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1835"/>
- <source>%O₂</source>
- <translation>%O₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1405"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2770"/>
- <source>Setpoint</source>
- <translation>Установка</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1443"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1709"/>
- <source>O₂ in calibration gas</source>
- <translation>O₂ в калибровочном газе</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1535"/>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2843"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1719"/>
@@ -1511,6 +1468,12 @@
<translation>pO₂ мин</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1583"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1722"/>
+ <source>Safety level</source>
+ <translation>Уровень безопасности</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1609"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1723"/>
<source>Altitude range</source>
@@ -1544,6 +1507,20 @@
<translation>P0 (отсутствует)</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1748"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1733"/>
+ <source>P1 (medium)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation>P1 (средний)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1753"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1734"/>
+ <source>P2 (high)</source>
+ <extracomment>Suunto safety level</extracomment>
+ <translation>P2 (высокий)</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1761"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1736"/>
<source>Sample rate</source>
@@ -1568,11 +1545,10 @@
<translation>60с</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="531"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1799"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1745"/>
- <source>Computer model</source>
- <translation>Модель</translation>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1792"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1744"/>
+ <source>Total dive time</source>
+ <translation>Общее время</translation>
</message>
<message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="1816"/>
@@ -1637,12 +1613,6 @@
<translation>Тревога: время</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
- <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
- <source>Salinity</source>
- <translation>Соленость</translation>
- </message>
- <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2074"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1774"/>
<source>MM/DD/YY</source>
@@ -1661,12 +1631,30 @@
<translation>ГГ/ММ/ДД</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2099"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1765"/>
+ <source>Salinity</source>
+ <translation>Соленость</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2109"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1769"/>
+ <source>kg/ℓ</source>
+ <translation>кг/л</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2341"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1794"/>
<source>ZH-L16 CC</source>
<translation>ZH-L16 ЗЦ</translation>
</message>
<message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2346"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1795"/>
+ <source>Apnoea</source>
+ <translation>Апноэ</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/configuredivecomputerdialog.ui" line="2351"/>
<location filename="../build/ui_configuredivecomputerdialog.h" line="1796"/>
<source>L16-GF OC</source>
@@ -1685,87 +1673,112 @@
<translation>PSCR-GF</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1108"/>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1129"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1539"/>
+ <source>OSTC 3</source>
+ <translation>OSTC 3</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1691"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1858"/>
+ <source>Set point [cbar]</source>
+ <translation>Установка [сбар]</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1693"/>
+ <location filename="../build/ui_configuredivecomputerdialog.h" line="1860"/>
+ <source>Change depth [m]</source>
+ <translation>Замена на [м]</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1110"/>
+ <source>Backup dive computer settings</source>
+ <translation>Создать рез. копию настроек</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1111"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1132"/>
<source>Backup files (*.xml)</source>
<translation>Резервные копии (*.xml)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1113"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1115"/>
+ <source>XML backup error</source>
+ <translation>XML-ошибка при создании рез. копии</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
<source>An error occurred while saving the backup file.
%1</source>
<translation>Ошибка при сохранении резервной копии.
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1116"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1119"/>
<source>Backup succeeded</source>
<translation>Резервная копия создана</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1117"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1120"/>
<source>Your settings have been saved to: %1</source>
<translation>Ваши настройки сохранены в %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1107"/>
- <source>Backup dive computer settings</source>
- <translation>Создать рез. копию настроек</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1112"/>
- <source>XML backup error</source>
- <translation>XML-ошибка при создании рез. копии</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1128"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1131"/>
<source>Restore dive computer settings</source>
<translation>Восстановить настройки дайвкомпьютера</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1134"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1137"/>
<source>XML restore error</source>
<translation>XML-ошибка при восстановлении</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1135"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1138"/>
<source>An error occurred while restoring the backup file.
%1</source>
<translation>Ошибка при восстановлении из рез. копии.
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1139"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1142"/>
<source>Restore succeeded</source>
<translation>Восстановление успешно</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1140"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1143"/>
<source>Your settings have been restored successfully.</source>
<translation>Настройки были успешно восстановлены.</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1150"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1153"/>
<source>Select firmware file</source>
<translation>Выберите файл прошивки</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1151"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1154"/>
<source>All files (*.*)</source>
<translation>Все файлы (*.*)</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1207"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1210"/>
<source>Choose file for divecomputer download logfile</source>
<translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1208"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1211"/>
<source>Log files (*.log)</source>
<translation>Файлы журналов (*.log)</translation>
</message>
</context>
<context>
+ <name>ContextDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/>
+ <source>Actions</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>CylindersModel</name>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
@@ -1779,11 +1792,6 @@
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="16"/>
- <source>He%</source>
- <translation>He%</translation>
- </message>
- <message>
- <location filename="../qt-models/cylindermodel.cpp" line="16"/>
<source>Work press.</source>
<translation>Раб. давл.</translation>
</message>
@@ -1803,9 +1811,24 @@
<translation>O₂%</translation>
</message>
<message>
+ <location filename="../qt-models/cylindermodel.cpp" line="16"/>
+ <source>He%</source>
+ <translation>He%</translation>
+ </message>
+ <message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
- <source>Switch at</source>
- <translation>Замена на</translation>
+ <source>Deco switch at</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>Bot. MOD</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="17"/>
+ <source>MND</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../qt-models/cylindermodel.cpp" line="17"/>
@@ -1823,17 +1846,32 @@
<translation>л</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="161"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="177"/>
<source>Clicking here will remove this cylinder.</source>
<translation>Нажмите здесь чтобы удалить этот баллон.</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="383"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="180"/>
+ <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="183"/>
+ <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to &apos;*&apos; for best O₂% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="186"/>
+ <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to &apos;*&apos; for best He% for max depth.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/cylindermodel.cpp" line="444"/>
<source>Cylinder cannot be removed</source>
<translation>Баллон не может быть удален</translation>
</message>
<message>
- <location filename="../qt-models/cylindermodel.cpp" line="384"/>
+ <location filename="../qt-models/cylindermodel.cpp" line="445"/>
<source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source>
<translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation>
</message>
@@ -1853,42 +1891,24 @@
<translation>Какие компоненты вы хотите скопировать</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
+ <location filename="../build/ui_divecomponentselection.h" line="141"/>
+ <source>Dive site</source>
+ <translation>Дайв-сайт</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="80"/>
<location filename="../build/ui_divecomponentselection.h" line="142"/>
<source>Suit</source>
<translation>Костюм</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
- <location filename="../build/ui_divecomponentselection.h" line="148"/>
- <source>Divemaster</source>
- <translation>Инструктор</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
- <location filename="../build/ui_divecomponentselection.h" line="149"/>
- <source>Buddy</source>
- <translation>Партнер</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
- <location filename="../build/ui_divecomponentselection.h" line="150"/>
- <source>Rating</source>
- <translation>Оценка</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="87"/>
<location filename="../build/ui_divecomponentselection.h" line="143"/>
<source>Visibility</source>
<translation>Видимость</translation>
</message>
<message>
- <location filename="../desktop-widgets/divecomponentselection.ui" line="73"/>
- <location filename="../build/ui_divecomponentselection.h" line="141"/>
- <source>Dive site</source>
- <translation>Дайв-сайт</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divecomponentselection.ui" line="94"/>
<location filename="../build/ui_divecomponentselection.h" line="144"/>
<source>Notes</source>
@@ -1912,10 +1932,34 @@
<source>Cylinders</source>
<translation>Баллоны</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="122"/>
+ <location filename="../build/ui_divecomponentselection.h" line="148"/>
+ <source>Divemaster</source>
+ <translation>Инструктор</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="129"/>
+ <location filename="../build/ui_divecomponentselection.h" line="149"/>
+ <source>Buddy</source>
+ <translation>Партнер</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divecomponentselection.ui" line="136"/>
+ <location filename="../build/ui_divecomponentselection.h" line="150"/>
+ <source>Rating</source>
+ <translation>Оценка</translation>
+ </message>
</context>
<context>
<name>DiveComputerManagementDialog</name>
<message>
+ <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
+ <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
+ <source>Edit dive computer nicknames</source>
+ <translation>Редактировать дайвкомпьютеры</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/>
<source>Remove the selected dive computer?</source>
<translation>Удалить компьютер?</translation>
@@ -1927,12 +1971,6 @@
<translation>Вы действительно хотите удалить
выбранный дайв-компьютер?</translation>
</message>
- <message>
- <location filename="../desktop-widgets/divecomputermanagementdialog.ui" line="17"/>
- <location filename="../build/ui_divecomputermanagementdialog.h" line="65"/>
- <source>Edit dive computer nicknames</source>
- <translation>Редактировать дайвкомпьютеры</translation>
- </message>
</context>
<context>
<name>DiveComputerModel</name>
@@ -1960,17 +1998,17 @@
<context>
<name>DiveDetails</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="33"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="38"/>
<source>Dive details</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="67"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="72"/>
<source>Delete dive</source>
<translation>Удалить погружение</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetails.qml" line="84"/>
+ <location filename="../mobile-widgets/qml/DiveDetails.qml" line="89"/>
<source>Show on map</source>
<translation type="unfinished"/>
</message>
@@ -1978,88 +2016,93 @@
<context>
<name>DiveDetailsEdit</name>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="74"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="80"/>
<source>Dive %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="78"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="84"/>
<source>Date:</source>
<translation>Дата:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="86"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="92"/>
<source>Location:</source>
<translation>Место:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="95"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="101"/>
<source>Coordinates:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="104"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="110"/>
<source>Use current
GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="124"/>
<source>Depth:</source>
<translation>Глубина:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="133"/>
<source>Duration:</source>
<translation>Длительность:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="137"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="143"/>
<source>Air Temp:</source>
<translation>Темп. воздуха:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="152"/>
<source>Water Temp:</source>
<translation>Темп. воды:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="161"/>
<source>Suit:</source>
<translation>Костюм:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="176"/>
<source>Buddy:</source>
<translation>Напарник:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="191"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="206"/>
<source>Weight:</source>
<translation>Вес:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/>
+ <source>Cylinder:</source>
+ <translation>Баллон:</translation>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="231"/>
<source>Gas mix:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="241"/>
<source>Start Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="213"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="250"/>
<source>End Pressure:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="224"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="260"/>
<source>Notes:</source>
<translation>Заметки:</translation>
</message>
@@ -2074,7 +2117,7 @@ GPS location:</source>
<message>
<location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="80"/>
<source>Depth: </source>
- <translation type="unfinished"/>
+ <translation>Глубина:</translation>
</message>
<message>
<location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="89"/>
@@ -2097,42 +2140,42 @@ GPS location:</source>
<translation>Костюм:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="159"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="158"/>
<source>Air Temp:</source>
<translation>Темп. воздуха:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="175"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="172"/>
<source>Cylinder:</source>
- <translation type="unfinished"/>
+ <translation>Баллон:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="189"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="185"/>
<source>Water Temp:</source>
<translation>Темп. воды:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="205"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="198"/>
<source>Dive Master:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="220"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="211"/>
<source>Weight:</source>
<translation>Вес:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="249"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="224"/>
<source>Buddy:</source>
<translation>Напарник:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="263"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="237"/>
<source>SAC:</source>
<translation>SAC:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="280"/>
+ <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="252"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
@@ -2140,18 +2183,18 @@ GPS location:</source>
<context>
<name>DiveEventItem</name>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="134"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="165"/>
<source>Manual switch to OC</source>
<translation>Ручной переход на ОЦ</translation>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="136"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="167"/>
<source> begin</source>
<comment>Starts with space!</comment>
<translation> начало</translation>
</message>
<message>
- <location filename="../profile-widget/diveeventitem.cpp" line="137"/>
+ <location filename="../profile-widget/diveeventitem.cpp" line="168"/>
<source> end</source>
<comment>Starts with space!</comment>
<translation> конец</translation>
@@ -2160,27 +2203,27 @@ GPS location:</source>
<context>
<name>DiveImportedModel</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="646"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="656"/>
<source>Date/time</source>
<translation>Дата/время</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="648"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="658"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="650"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="660"/>
<source>Depth</source>
<translation>Глубина</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>h:</source>
<translation>ч:</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="672"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="682"/>
<source>min</source>
<translation>мин</translation>
</message>
@@ -2189,15 +2232,15 @@ GPS location:</source>
<name>DiveList</name>
<message>
<location filename="../mobile-widgets/qml/DiveList.qml" line="12"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="226"/>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="227"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="233"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../mobile-widgets/qml/DiveList.qml" line="95"/>
<source>Depth: </source>
- <translation type="unfinished"/>
+ <translation>Глубина:</translation>
</message>
<message>
<location filename="../mobile-widgets/qml/DiveList.qml" line="106"/>
@@ -2205,110 +2248,115 @@ GPS location:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="222"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="223"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/DiveList.qml" line="228"/>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="229"/>
<source>Please tap the &apos;+&apos; button to add a dive</source>
<translation type="unfinished"/>
</message>
+ <message>
+ <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/>
+ <source>No dives in dive list</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>DiveListView</name>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="846"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="849"/>
<source>Expand all</source>
<translation>Развернуть все</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="848"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="851"/>
<source>Collapse all</source>
<translation>Свернуть все</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="852"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="855"/>
<source>Collapse others</source>
<translation>Свернуть остальные</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="856"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="859"/>
<source>Remove dive(s) from trip</source>
<translation>Удалить из поездки</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="860"/>
<source>Create new trip above</source>
<translation>Создать поездку выше</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="871"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="874"/>
<source>Add dive(s) to trip immediately above</source>
<translation>Добавить к поездке сверху</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="873"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="876"/>
<source>Add dive(s) to trip immediately below</source>
<translation>Добавить к поездке снизу</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="877"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="880"/>
<source>Merge trip with trip above</source>
<translation>Объединить с поездкой выше</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="878"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="881"/>
<source>Merge trip with trip below</source>
<translation>Объединить с поездкой ниже</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="882"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="885"/>
<source>Delete dive(s)</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="884"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="887"/>
<source>Mark dive(s) invalid</source>
<translation>Пометить как ошибочное(-ые)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="888"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
<source>Merge selected dives</source>
<translation>Объединить выбранные</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="890"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
<source>Renumber dive(s)</source>
<translation>Перенумеровать</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="891"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
<source>Shift dive times</source>
<translation>Сдвиг времени</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="892"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="895"/>
<source>Split selected dives</source>
<translation>Разбить выделенные погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="893"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="896"/>
<source>Load image(s) from file(s)</source>
<translation>Загрузить фото из файлов</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="894"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="897"/>
<source>Load image(s) from web</source>
<translation>Загрузить фото из Web</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Open image files</source>
<translation>Открыть файлы изображений</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelistview.cpp" line="917"/>
+ <location filename="../desktop-widgets/divelistview.cpp" line="919"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -2329,56 +2377,6 @@ GPS location:</source>
<context>
<name>DiveLogExportDialog</name>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
- <location filename="../build/ui_divelogexportdialog.h" line="351"/>
- <source>Export format</source>
- <translation>Формат экспорта</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
- <location filename="../build/ui_divelogexportdialog.h" line="353"/>
- <source>UDDF</source>
- <translation>UDDF</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
- <location filename="../build/ui_divelogexportdialog.h" line="358"/>
- <source>Worldmap</source>
- <translation>Карта мира</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
- <location filename="../build/ui_divelogexportdialog.h" line="359"/>
- <source>I&amp;mage depths</source>
- <translation>Глубины из фото</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="243"/>
- <location filename="../build/ui_divelogexportdialog.h" line="360"/>
- <source>Selection</source>
- <translation>Выбор</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="252"/>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="346"/>
- <location filename="../build/ui_divelogexportdialog.h" line="361"/>
- <location filename="../build/ui_divelogexportdialog.h" line="372"/>
- <source>Selected dives</source>
- <translation>Выделенные погружения</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
- <location filename="../build/ui_divelogexportdialog.h" line="362"/>
- <source>All dives</source>
- <translation>Все погружения</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="306"/>
- <location filename="../build/ui_divelogexportdialog.h" line="396"/>
- <source>HTML</source>
- <translation>HTML</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="14"/>
<location filename="../build/ui_divelogexportdialog.h" line="349"/>
<source>Export dive log files</source>
@@ -2391,12 +2389,24 @@ GPS location:</source>
<translation>Обычный</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="103"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="351"/>
+ <source>Export format</source>
+ <translation>Формат экспорта</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="115"/>
<location filename="../build/ui_divelogexportdialog.h" line="352"/>
<source>Subsurface &amp;XML</source>
<translation>Subsurface &amp;XML</translation>
</message>
<message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="134"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="353"/>
+ <source>UDDF</source>
+ <translation>UDDF</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.ui" line="147"/>
<location filename="../build/ui_divelogexportdialog.h" line="354"/>
<source>di&amp;velogs.de</source>
@@ -2421,238 +2431,297 @@ GPS location:</source>
<translation>Погружение в CSV</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="275"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="187"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="358"/>
+ <source>Worldmap</source>
+ <translation>Карта мира</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="197"/>
+ <source>TeX</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="207"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="359"/>
+ <source>I&amp;mage depths</source>
+ <translation>Глубины из фото</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="253"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="360"/>
+ <source>Selection</source>
+ <translation>Выбор</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="262"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="356"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="361"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="372"/>
+ <source>Selected dives</source>
+ <translation>Выделенные погружения</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="272"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="362"/>
+ <source>All dives</source>
+ <translation>Все погружения</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="285"/>
<location filename="../build/ui_divelogexportdialog.h" line="363"/>
<source>CSV units</source>
<translation>Система мер</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="288"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="298"/>
<location filename="../build/ui_divelogexportdialog.h" line="366"/>
<source>Metric</source>
<translation>Метрическая</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="293"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="303"/>
<location filename="../build/ui_divelogexportdialog.h" line="367"/>
<source>Imperial</source>
<translation>Имперская</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="324"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="316"/>
+ <location filename="../build/ui_divelogexportdialog.h" line="396"/>
+ <source>HTML</source>
+ <translation>HTML</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="334"/>
<location filename="../build/ui_divelogexportdialog.h" line="370"/>
<source>General settings</source>
<translation>Общие настройки</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="330"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="340"/>
<location filename="../build/ui_divelogexportdialog.h" line="371"/>
<source>Subsurface numbers</source>
<translation>Нумерация Subsurface</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="359"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="369"/>
<location filename="../build/ui_divelogexportdialog.h" line="373"/>
<source>Export yearly statistics</source>
<translation>Выгружать статистику за год</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="375"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
<location filename="../build/ui_divelogexportdialog.h" line="374"/>
<source>All di&amp;ves</source>
<translation>Все погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="385"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="395"/>
<location filename="../build/ui_divelogexportdialog.h" line="375"/>
<source>Export list only</source>
<translation>Только список</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="392"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="402"/>
<location filename="../build/ui_divelogexportdialog.h" line="376"/>
<source>Export photos</source>
<translation>Экспорт фото</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="408"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="418"/>
<location filename="../build/ui_divelogexportdialog.h" line="377"/>
<source>Style options</source>
<translation>Настройки стиля</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="423"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
<location filename="../build/ui_divelogexportdialog.h" line="378"/>
<source>Font</source>
<translation>Шрифт</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="433"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="443"/>
<location filename="../build/ui_divelogexportdialog.h" line="379"/>
<source>Font size</source>
<translation>Размер шрифта</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="444"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
<location filename="../build/ui_divelogexportdialog.h" line="382"/>
<source>8</source>
<translation>8</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="449"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
<location filename="../build/ui_divelogexportdialog.h" line="383"/>
<source>10</source>
<translation>10</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="454"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
<location filename="../build/ui_divelogexportdialog.h" line="384"/>
<source>12</source>
<translation>12</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="459"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
<location filename="../build/ui_divelogexportdialog.h" line="385"/>
<source>14</source>
<translation>14</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="464"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
<location filename="../build/ui_divelogexportdialog.h" line="386"/>
<source>16</source>
<translation>16</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="469"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="479"/>
<location filename="../build/ui_divelogexportdialog.h" line="387"/>
<source>18</source>
<translation>18</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="474"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="484"/>
<location filename="../build/ui_divelogexportdialog.h" line="388"/>
<source>20</source>
<translation>20</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="482"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="492"/>
<location filename="../build/ui_divelogexportdialog.h" line="390"/>
<source>Theme</source>
<translation>Тема</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="493"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="503"/>
<location filename="../build/ui_divelogexportdialog.h" line="393"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="95"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="99"/>
<source>Light</source>
<translation>Светлая</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.ui" line="498"/>
+ <location filename="../desktop-widgets/divelogexportdialog.ui" line="508"/>
<location filename="../build/ui_divelogexportdialog.h" line="394"/>
<source>Sand</source>
<translation>Песочная</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="134"/>
- <source>UDDF files (*.uddf *.UDDF)</source>
- <translation>UDDF файлы (*.uddf *.UDDF)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
- <source>CSV files (*.csv *.CSV)</source>
- <translation>CSV файлы (*.csv *.CSV)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="74"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="76"/>
<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="76"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
<source>Comma separated values describing the dive profile.</source>
<translation>Профиль погружения в виде значений, разделенных запятой.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="78"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="80"/>
<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="80"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
<source>Send the dive data to divelogs.de website.</source>
<translation>Отправить данные погружения на сайт divelogs.de.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="82"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="84"/>
<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="84"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="86"/>
<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="86"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
<source>Subsurface native XML format.</source>
<translation>Собственный XML-формат Subsurface.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="88"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="90"/>
<source>Write depths of images to file.</source>
<translation>Выгружает имена фотографий и глубины, на которых они были сделаны.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="133"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="92"/>
+ <source>Write dive as TeX macros to file.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
<source>Export UDDF file as</source>
<translation>Файл для UDDF экспорта</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="137"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="138"/>
+ <source>UDDF files (*.uddf *.UDDF)</source>
+ <translation>UDDF файлы (*.uddf *.UDDF)</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/>
<source>Export CSV file as</source>
<translation>Файл для CSV экспорта</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="142"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="146"/>
+ <source>CSV files (*.csv *.CSV)</source>
+ <translation>CSV файлы (*.csv *.CSV)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="152"/>
<source>Export world map</source>
<translation>Файл для экспорта карты</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="177"/>
<source>HTML files (*.html)</source>
<translation>HTML файлы (*.html)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="153"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="157"/>
<source>Export Subsurface XML</source>
<translation>Экспорт Subsurface XML</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="158"/>
<source>XML files (*.xml *.ssrf)</source>
<translation>XML файлы (*.xml *.ssrf)</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="162"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="166"/>
<source>Save image depths</source>
<translation>Экспорт глубин фотографий</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>Export to TeX file</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="170"/>
+ <source>TeX files (*.tex)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="176"/>
<source>Export HTML files as</source>
<translation>Экспортировать HTML файл как</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="184"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="192"/>
<source>Please wait, exporting...</source>
<translation>Ожидайте, идет экспорт...</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogexportdialog.cpp" line="219"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="227"/>
+ <location filename="../desktop-widgets/divelogexportdialog.cpp" line="311"/>
<source>Can&apos;t open file %s</source>
<translation>Невозможно открыть файл %s</translation>
</message>
@@ -2666,25 +2735,6 @@ GPS location:</source>
<translation>Импорт журнала погружений</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="727"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="856"/>
- <source>Time</source>
- <translation>Время</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
- <location filename="../build/ui_divelogimportdialog.h" line="164"/>
- <source>Metric</source>
- <translation>Метрическая</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
- <location filename="../build/ui_divelogimportdialog.h" line="165"/>
- <source>Imperial</source>
- <translation>Имперская</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.ui" line="89"/>
<location filename="../build/ui_divelogimportdialog.h" line="152"/>
<source>dd.mm.yyyy</source>
@@ -2703,74 +2753,6 @@ GPS location:</source>
<translation>гггг-мм-дд</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
- <location filename="../build/ui_divelogimportdialog.h" line="167"/>
- <source>Drag the tags above to each corresponding column below</source>
- <translation>Перетащите метки на соответствующие колонки ниже</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="729"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="852"/>
- <source>Dive #</source>
- <translation>№</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="723"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="854"/>
- <source>Date</source>
- <translation>Дата</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="858"/>
- <source>Duration</source>
- <translation>Длительность</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="862"/>
- <source>GPS</source>
- <translation>GPS</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="864"/>
- <source>Max. depth</source>
- <translation>Макс. глубина</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="866"/>
- <source>Avg. depth</source>
- <translation>Сред. глубина</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="872"/>
- <source>Suit</source>
- <translation>Костюм</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/>
- <source>Tags</source>
- <translation>Метки</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/>
- <source>O₂</source>
- <translation>O₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/>
- <source>He</source>
- <translation>He</translation>
- </message>
- <message>
<location filename="../desktop-widgets/divelogimportdialog.ui" line="108"/>
<location filename="../build/ui_divelogimportdialog.h" line="158"/>
<source>Seconds</source>
@@ -2789,183 +2771,269 @@ GPS location:</source>
<translation>Минуты:секунды</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="860"/>
- <source>Location</source>
- <translation>Местонахождение</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="127"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="164"/>
+ <source>Metric</source>
+ <translation>Метрическая</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="132"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="165"/>
+ <source>Imperial</source>
+ <translation>Имперская</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.ui" line="155"/>
+ <location filename="../build/ui_divelogimportdialog.h" line="167"/>
+ <source>Drag the tags above to each corresponding column below</source>
+ <translation>Перетащите метки на соответствующие колонки ниже</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="354"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="499"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="505"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="355"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="528"/>
<source>Tab</source>
<translation>Tab</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="575"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="598"/>
<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="613"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="731"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="848"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="636"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="857"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/>
<source>Sample time</source>
<translation>Выборка времени</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="615"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="733"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="638"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="859"/>
<source>Sample depth</source>
<translation>Выборка глубины</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="617"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="735"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="786"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="640"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="861"/>
<source>Sample temperature</source>
<translation>Выборка температуры</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="621"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="739"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="790"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="863"/>
+ <source>Sample pO₂</source>
+ <translation>Выборка pO₂</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="865"/>
<source>Sample sensor1 pO₂</source>
<translation>Выборка 1-го сеносора pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="623"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="741"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="792"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="867"/>
<source>Sample sensor2 pO₂</source>
<translation>Выборка 2-го сеносора pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="625"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="743"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="794"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="869"/>
<source>Sample sensor3 pO₂</source>
<translation>Выборка 3-го сеносора pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="633"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="802"/>
- <source>Sample stopdepth</source>
- <translation>Выборка остановки</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="637"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/>
- <source>Sample setpoint</source>
- <translation>Выборка установки</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="619"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="737"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="788"/>
- <source>Sample pO₂</source>
- <translation>Выборка pO₂</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="627"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="745"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="796"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="871"/>
<source>Sample CNS</source>
<translation>Выборка CNS</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="629"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="747"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="798"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="873"/>
<source>Sample NDL</source>
<translation>Выборка NDL</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="631"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="749"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="800"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/>
<source>Sample TTS</source>
<translation>Выборка TTS</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="635"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="804"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="877"/>
+ <source>Sample stopdepth</source>
+ <translation>Выборка остановки</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/>
<source>Sample pressure</source>
<translation>Выборка давления</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="868"/>
- <source>Divemaster</source>
- <translation>Инструктор</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="785"/>
+ <source>Sample setpoint</source>
+ <translation>Выборка установки</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="870"/>
- <source>Buddy</source>
- <translation>Партнер</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="929"/>
+ <source>Dive #</source>
+ <translation>№</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/>
- <source>Rating</source>
- <translation>Оценка</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="753"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="931"/>
+ <source>Date</source>
+ <translation>Дата</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/>
- <source>Visibility</source>
- <translation>Видимость</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="933"/>
+ <source>Time</source>
+ <translation>Время</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/>
- <source>Notes</source>
- <translation>Примечания</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="667"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="935"/>
+ <source>Duration</source>
+ <translation>Длительность</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="876"/>
- <source>Weight</source>
- <translation>Вес</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="668"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="941"/>
+ <source>Max. depth</source>
+ <translation>Макс. глубина</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="943"/>
+ <source>Avg. depth</source>
+ <translation>Сред. глубина</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="975"/>
+ <source>Air temp.</source>
+ <translation>Темп. воздуха</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="977"/>
+ <source>Water temp.</source>
+ <translation>Темп. воды</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="965"/>
<source>Cyl. size</source>
<translation>Объем баллона</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="967"/>
<source>Start pressure</source>
<translation>Нач. давл.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="969"/>
<source>End pressure</source>
<translation>Кон. давл.</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/>
- <source>Air temp.</source>
- <translation>Темп. воздуха</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="971"/>
+ <source>O₂</source>
+ <translation>O₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/>
- <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/>
- <source>Water temp.</source>
- <translation>Темп. воды</translation>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="973"/>
+ <source>He</source>
+ <translation>He</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="937"/>
+ <source>Location</source>
+ <translation>Местонахождение</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="939"/>
+ <source>GPS</source>
+ <translation>GPS</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="945"/>
+ <source>Divemaster</source>
+ <translation>Инструктор</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="947"/>
+ <source>Buddy</source>
+ <translation>Партнер</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="949"/>
+ <source>Suit</source>
+ <translation>Костюм</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/>
+ <source>Rating</source>
+ <translation>Оценка</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/>
+ <source>Visibility</source>
+ <translation>Видимость</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="951"/>
+ <source>Notes</source>
+ <translation>Примечания</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="953"/>
+ <source>Weight</source>
+ <translation>Вес</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/>
+ <location filename="../desktop-widgets/divelogimportdialog.cpp" line="955"/>
+ <source>Tags</source>
+ <translation>Метки</translation>
</message>
</context>
<context>
<name>DiveObjectHelper</name>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="287"/>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="323"/>
<source>%1 dive(s)</source>
<translation type="unfinished"/>
</message>
@@ -2973,18 +3041,18 @@ GPS location:</source>
<context>
<name>DivePlanner</name>
<message>
- <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
- <location filename="../build/ui_diveplanner.h" line="190"/>
- <source>Altitude</source>
- <translation>Высота</translation>
- </message>
- <message>
<location filename="../desktop-widgets/diveplanner.ui" line="109"/>
<location filename="../build/ui_diveplanner.h" line="189"/>
<source>Planned dive time</source>
<translation>Планируемое время погружения</translation>
</message>
<message>
+ <location filename="../desktop-widgets/diveplanner.ui" line="152"/>
+ <location filename="../build/ui_diveplanner.h" line="190"/>
+ <source>Altitude</source>
+ <translation>Высота</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/diveplanner.ui" line="159"/>
<location filename="../build/ui_diveplanner.h" line="191"/>
<source>ATM pressure</source>
@@ -3018,32 +3086,32 @@ GPS location:</source>
<context>
<name>DivePlannerPointsModel</name>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="134"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="136"/>
<source>unknown</source>
<translation>неизвестно</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="312"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="326"/>
<source>Final depth</source>
<translation>Глубина</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="314"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="328"/>
<source>Run time</source>
<translation>Отсчет</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="316"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="330"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="318"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="332"/>
<source>Used gas</source>
<translation>Исп. газ</translation>
</message>
<message>
- <location filename="../qt-models/diveplannermodel.cpp" line="320"/>
+ <location filename="../qt-models/diveplannermodel.cpp" line="334"/>
<source>CC setpoint</source>
<translation>Установка ребризера</translation>
</message>
@@ -3051,22 +3119,22 @@ GPS location:</source>
<context>
<name>DivePlannerWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="108"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
<source>Dive planner points</source>
<translation>Путевые точки плана</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="112"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="116"/>
<source>Available gases</source>
<translation>Доступные смеси</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="137"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="143"/>
<source>Add dive data point</source>
<translation>Добавить путевую точку</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="146"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="152"/>
<source>Save new</source>
<translation>Сохранить новый</translation>
</message>
@@ -3099,11 +3167,36 @@ GPS location:</source>
<translation>Цвет</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
+ <source>User entered</source>
+ <translation>Пользователь</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
+ <source>Cylinder index</source>
+ <translation>Индекс баллона</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="128"/>
<source>Pressure S</source>
<translation>Давление S</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
+ <source>Pressure I</source>
+ <translation>Давление I</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
+ <source>Ceiling</source>
+ <translation>Потолок</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="136"/>
<source>pN₂</source>
<translation>pN₂</translation>
@@ -3139,49 +3232,24 @@ GPS location:</source>
<translation>Сенсор 3</translation>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
- <source>Heart rate</source>
- <translation>Пульс</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
- <source>Mean depth @ s</source>
- <translation>Средняя глубина @ s</translation>
- </message>
- <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="150"/>
<source>Ambient pressure</source>
<translation>Внешнее давление</translation>
</message>
<message>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/>
+ <source>Heart rate</source>
+ <translation>Пульс</translation>
+ </message>
+ <message>
<location filename="../qt-models/diveplotdatamodel.cpp" line="154"/>
<source>Gradient factor</source>
<translation>Градиент-фактор</translation>
</message>
<message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/>
- <source>Pressure I</source>
- <translation>Давление I</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/>
- <source>User entered</source>
- <translation>Пользователь</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/>
- <source>Cylinder index</source>
- <translation>Индекс баллона</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/>
- <source>Ceiling</source>
- <translation>Потолок</translation>
- </message>
- <message>
- <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/>
- <source>SAC</source>
- <translation>SAC</translation>
+ <location filename="../qt-models/diveplotdatamodel.cpp" line="156"/>
+ <source>Mean depth @ s</source>
+ <translation>Средняя глубина @ s</translation>
</message>
</context>
<context>
@@ -3252,311 +3320,315 @@ p, li { white-space: pre-wrap; }
<context>
<name>DiveTripModel</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="395"/>
- <location filename="../qt-models/divetripmodel.cpp" line="441"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="434"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="483"/>
<source>#</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="398"/>
- <location filename="../qt-models/divetripmodel.cpp" line="444"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="437"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="486"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="401"/>
- <location filename="../qt-models/divetripmodel.cpp" line="447"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="440"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="489"/>
<source>Rating</source>
<translation>Оценка</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="404"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="443"/>
<source>Depth</source>
<translation>Глубина</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="410"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="446"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="495"/>
+ <source>Duration</source>
+ <translation>Длительность</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="449"/>
<source>Temp</source>
<translation>Темп.</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="413"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="452"/>
<source>Weight</source>
<translation>Вес</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="425"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>m</source>
- <translation>м</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
- <source>ft</source>
- <translation>фут</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>Weight(%1)</source>
- <translation>Вес(%1)</translation>
- </message>
- <message>
- <location filename="../qt-models/divetripmodel.cpp" line="416"/>
- <location filename="../qt-models/divetripmodel.cpp" line="462"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="455"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="504"/>
<source>Suit</source>
<translation>Костюм</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="419"/>
- <location filename="../qt-models/divetripmodel.cpp" line="465"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="458"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="507"/>
<source>Cyl</source>
<translation>Баллон</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="422"/>
- <location filename="../qt-models/divetripmodel.cpp" line="468"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="461"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="510"/>
<source>Gas</source>
<translation>Смесь</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>SAC(%1)</source>
- <translation>SAC(%1)</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="464"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="473"/>
- <source>/min</source>
- <translation>/мин</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="467"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="518"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="431"/>
- <location filename="../qt-models/divetripmodel.cpp" line="479"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="470"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="521"/>
<source>Max CNS</source>
<translation>Макс. CNS</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="434"/>
- <location filename="../qt-models/divetripmodel.cpp" line="482"/>
- <source>Location</source>
- <translation>Местонахождение</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="473"/>
+ <source>Photos</source>
+ <translation>Фотографии</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
- <source>kg</source>
- <translation>кг</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="476"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="527"/>
+ <source>Location</source>
+ <translation>Местонахождение</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="450"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
<source>Depth(%1)</source>
<translation>Глубина(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="407"/>
- <location filename="../qt-models/divetripmodel.cpp" line="453"/>
- <source>Duration</source>
- <translation>Длительность</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>m</source>
+ <translation>м</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="492"/>
+ <source>ft</source>
+ <translation>фут</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="456"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="498"/>
<source>Temp(%1%2)</source>
<translation>Температура(%1%2)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="459"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>Weight(%1)</source>
+ <translation>Вес(%1)</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
+ <source>kg</source>
+ <translation>кг</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="501"/>
<source>lbs</source>
<translation>фунт</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="428"/>
- <location filename="../qt-models/divetripmodel.cpp" line="476"/>
- <source>OTU</source>
- <translation>OTU</translation>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>SAC(%1)</source>
+ <translation>SAC(%1)</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="515"/>
+ <source>/min</source>
+ <translation>/мин</translation>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="524"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<name>DivelogsDeWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="164"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/>
<source>no dives were selected</source>
<translation>не выбраны погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="174"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/>
<source>stylesheet to export to divelogs.de is not found</source>
<translation>Не найден стиль для экспорта в divelogs.de</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="184"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="185"/>
<source>failed to create zip file for upload: %s</source>
<translation>не удалось создать ZIP файл для загрузки: %s</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="236"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="237"/>
<source>internal error</source>
<translation>внутренняя ошибка</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="244"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="245"/>
<source>Conversion of dive %1 to divelogs.de format failed</source>
<translation>Ошибка преобразования погружения %1 в формат divelogs.de</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="272"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="273"/>
<source>error writing zip file: %s zip error %d system error %d - %s</source>
<translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="935"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
<source>Done</source>
<translation>Готово</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="778"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/>
<source>Uploading dive list...</source>
<translation>Выгрузка списка погружений...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="810"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/>
<source>Downloading dive list...</source>
<translation>Загрузка списка погружений...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="851"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/>
<source>Downloading %1 dives...</source>
<translation>Загрузка %1 погружений...</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="885"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/>
<source>Download finished - %1</source>
<translation>Загрузка завершена - %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
<source>Problem with download</source>
<translation>Ошибка загрузки</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/>
<source>The archive could not be opened:
</source>
<translation>Невозможно открыть архив:
</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="909"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
<source>Corrupted download</source>
<translation>Поврежденная загрузка</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/>
<source>The archive could not be opened:
%1</source>
<translation>Невозможно открыть архив:
%1</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/>
+ <source>Upload finished</source>
+ <translation>Выгрузка завершена</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/>
<source>Upload failed</source>
<translation>Выгрузка не удалась</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="952"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/>
<source>Upload successful</source>
<translation>Выгрузка завершена</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="955"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/>
<source>Login failed</source>
<translation>Ошибка входа</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="958"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/>
<source>Cannot parse response</source>
<translation>Ошибка разбора ответа</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="970"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/>
<source>Error: %1</source>
<translation>Ошибка: %1</translation>
</message>
- <message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/>
- <source>Upload finished</source>
- <translation>Выгрузка завершена</translation>
- </message>
</context>
<context>
<name>DownloadFromDCWidget</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="185"/>
- <source>Error</source>
- <translation>Ошибка</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="436"/>
- <source>Retry</source>
- <translation>Повторить</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="280"/>
- <source>Find Uemis dive computer</source>
- <translation>Найти дайвкомпьютер Uemis</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="101"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="107"/>
<source>Download</source>
<translation>Загрузить</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="104"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="110"/>
<source>Choose Bluetooth download mode</source>
<translation>Выберите режим загрузки по Bluetooth</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="191"/>
+ <source>Error</source>
+ <translation>Ошибка</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="286"/>
+ <source>Find Uemis dive computer</source>
+ <translation>Найти дайвкомпьютер Uemis</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/>
<source>Choose file for divecomputer download logfile</source>
<translation>Выберите файл для журнала загрузки из дайв-компьютера</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="393"/>
<source>Log files (*.log)</source>
<translation>Файлы журналов (*.log)</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="398"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="408"/>
<source>Warning</source>
<translation>Предупреждение</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="399"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="409"/>
<source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source>
<translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="410"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/>
<source>Choose file for divecomputer binary dump file</source>
<translation>Выберите файл для двоичного дампа из дайв-компьютера</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="411"/>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="421"/>
<source>Dump files (*.bin)</source>
<translation>Дамп-файлы (*.bin)</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="446"/>
+ <source>Retry</source>
+ <translation>Повторить</translation>
+ </message>
</context>
<context>
<name>DownloadFromDiveComputer</name>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
- <source>Vendor</source>
- <translation>Производитель</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="14"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="265"/>
<source>Download from dive computer</source>
@@ -3569,17 +3641,6 @@ p, li { white-space: pre-wrap; }
<translation>Устройство или точка монтирования</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
- <source>Choose Bluetooth download mode</source>
- <translation>Загрузка через Bluetooth</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
- <source>Dive computer</source>
- <translation>Модель</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="66"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="101"/>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="115"/>
@@ -3603,11 +3664,46 @@ p, li { white-space: pre-wrap; }
<translation>Предпочтение загруженным</translation>
</message>
<message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
+ <source>Download into new trip</source>
+ <translation>Загружать в новую поездку</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
+ <source>Save libdivecomputer logfile</source>
+ <translation>Сохранить журнал libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
+ <source>Save libdivecomputer dumpfile</source>
+ <translation>Сохранить дамп-файл libdivecomputer</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="122"/>
+ <source>Choose Bluetooth download mode</source>
+ <translation>Загрузка через Bluetooth</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="129"/>
<source>Select a remote Bluetooth device.</source>
<translation>Выберите устройство Bluetooth.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="139"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="275"/>
+ <source>Vendor</source>
+ <translation>Производитель</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="149"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="276"/>
+ <source>Dive computer</source>
+ <translation>Модель</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="52"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="277"/>
@@ -3615,18 +3711,6 @@ p, li { white-space: pre-wrap; }
<translation>Загрузить</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
- <source>OK</source>
- <translation>OK</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
- <source>Cancel</source>
- <translation>Отмена</translation>
- </message>
- <message>
<location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="226"/>
<location filename="../build/ui_downloadfromdivecomputer.h" line="278"/>
<source>Downloaded dives</source>
@@ -3645,22 +3729,16 @@ p, li { white-space: pre-wrap; }
<translation>Снять выделение</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="94"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="271"/>
- <source>Save libdivecomputer logfile</source>
- <translation>Сохранить журнал libdivecomputer</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="108"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="273"/>
- <source>Save libdivecomputer dumpfile</source>
- <translation>Сохранить дамп-файл libdivecomputer</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="284"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="281"/>
+ <source>OK</source>
+ <translation>OK</translation>
</message>
<message>
- <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="87"/>
- <location filename="../build/ui_downloadfromdivecomputer.h" line="270"/>
- <source>Download into new trip</source>
- <translation>Загружать в новую поездку</translation>
+ <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="291"/>
+ <location filename="../build/ui_downloadfromdivecomputer.h" line="282"/>
+ <source>Cancel</source>
+ <translation>Отмена</translation>
</message>
<message>
<location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="16"/>
@@ -3750,12 +3828,12 @@ p, li { white-space: pre-wrap; }
<translation>Соединение с Facebook</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="297"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="242"/>
<source>To disconnect Subsurface from your Facebook account, use the button below</source>
<translation>Чтобы отключить Subsurface от Facebook, нажмите на кнопку ниже</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="306"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="251"/>
<source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source>
<translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation>
</message>
@@ -3763,22 +3841,22 @@ p, li { white-space: pre-wrap; }
<context>
<name>FacebookManager</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="266"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="211"/>
<source>Photo upload sucessfull</source>
<translation>Выгрузка фото успешна!</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="267"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="212"/>
<source>Your dive profile was updated to Facebook.</source>
<translation>Профиль погружения обновлен на Facebook.</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="271"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="216"/>
<source>Photo upload failed</source>
<translation>Выгрузка фото не удалась!</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="272"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="217"/>
<source>Your dive profile was not updated to Facebook,
please send the following to the developer.
</source>
@@ -3840,17 +3918,25 @@ p, li { white-space: pre-wrap; }
<context>
<name>FirmwareUpdateThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1750"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1739"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
</message>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1755"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1744"/>
<source>Firmware update failed!</source>
<translation>Обонвление прошивки не удалось!</translation>
</message>
</context>
<context>
+ <name>GlobalDrawer</name>
+ <message>
+ <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="364"/>
+ <source>Back</source>
+ <translation type="unfinished"/>
+ </message>
+</context>
+<context>
<name>GlobeGPS</name>
<message>
<location filename="../desktop-widgets/globe.cpp" line="124"/>
@@ -3866,27 +3952,27 @@ p, li { white-space: pre-wrap; }
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="40"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="32"/>
<source>Date: </source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="50"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="42"/>
<source>Name: </source>
<translation>Название:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="60"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="52"/>
<source>Latitude: </source>
- <translation type="unfinished"/>
+ <translation>Широта:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="69"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="61"/>
<source>Longitude: </source>
- <translation type="unfinished"/>
+ <translation>Долгота:</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/GpsList.qml" line="113"/>
+ <location filename="../mobile-widgets/qml/GpsList.qml" line="105"/>
<source>List of stored GPS fixes</source>
<translation type="unfinished"/>
</message>
@@ -3915,7 +4001,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LocationFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="648"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="646"/>
<source>Location: </source>
<translation>Места:</translation>
</message>
@@ -3956,7 +4042,7 @@ p, li { white-space: pre-wrap; }
<context>
<name>LocationFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="299"/>
+ <location filename="../qt-models/filtermodels.cpp" line="304"/>
<source>No location set</source>
<translation>Место не указано</translation>
</message>
@@ -4078,20 +4164,55 @@ p, li { white-space: pre-wrap; }
</message>
</context>
<context>
- <name>MainForm.ui</name>
+ <name>MainTab</name>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="17"/>
- <source>Press Me 1</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/maintab.ui" line="18"/>
+ <location filename="../desktop-widgets/maintab.ui" line="439"/>
+ <location filename="../build/ui_maintab.h" line="961"/>
+ <location filename="../build/ui_maintab.h" line="963"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="539"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="571"/>
+ <source>Notes</source>
+ <translation>Примечания</translation>
</message>
<message>
- <location filename="../packaging/ios/Subsurface-mobile/MainForm.ui.qml" line="22"/>
- <source>Press Me 2</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/maintab.ui" line="21"/>
+ <location filename="../build/ui_maintab.h" line="964"/>
+ <source>General notes about the current selection</source>
+ <translation>Основная информация о выделенных погружениях</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="92"/>
+ <location filename="../desktop-widgets/maintab.ui" line="646"/>
+ <location filename="../build/ui_maintab.h" line="947"/>
+ <location filename="../build/ui_maintab.h" line="967"/>
+ <source>Date</source>
+ <translation>Дата</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="102"/>
+ <location filename="../build/ui_maintab.h" line="948"/>
+ <source>Time</source>
+ <translation>Время</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="112"/>
+ <location filename="../desktop-widgets/maintab.ui" line="836"/>
+ <location filename="../build/ui_maintab.h" line="949"/>
+ <location filename="../build/ui_maintab.h" line="987"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="306"/>
+ <source>Air temp.</source>
+ <translation>Темп. воздуха</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="122"/>
+ <location filename="../desktop-widgets/maintab.ui" line="855"/>
+ <location filename="../build/ui_maintab.h" line="950"/>
+ <location filename="../build/ui_maintab.h" line="989"/>
+ <location filename="../desktop-widgets/maintab.cpp" line="307"/>
+ <source>Water temp.</source>
+ <translation>Темп. воды</translation>
</message>
-</context>
-<context>
- <name>MainTab</name>
<message>
<location filename="../desktop-widgets/maintab.ui" line="184"/>
<location filename="../build/ui_maintab.h" line="951"/>
@@ -4100,6 +4221,17 @@ p, li { white-space: pre-wrap; }
<translation>Местонахождение</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="214"/>
+ <source>Edit dive site</source>
+ <translation>Редактирование сайта</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="217"/>
+ <location filename="../build/ui_maintab.h" line="953"/>
+ <source>...</source>
+ <translation>...</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="252"/>
<location filename="../build/ui_maintab.h" line="954"/>
<source>Divemaster</source>
@@ -4112,12 +4244,6 @@ p, li { white-space: pre-wrap; }
<translation>Партнер</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="387"/>
- <location filename="../build/ui_maintab.h" line="959"/>
- <source>Tags</source>
- <translation>Метки</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="308"/>
<location filename="../build/ui_maintab.h" line="956"/>
<source>Rating</source>
@@ -4136,57 +4262,18 @@ p, li { white-space: pre-wrap; }
<translation>Костюм</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="387"/>
+ <location filename="../build/ui_maintab.h" line="959"/>
+ <source>Tags</source>
+ <translation>Метки</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="397"/>
<location filename="../build/ui_maintab.h" line="960"/>
<source>Dive mode</source>
<translation>Режим</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="112"/>
- <location filename="../desktop-widgets/maintab.ui" line="836"/>
- <location filename="../build/ui_maintab.h" line="949"/>
- <location filename="../build/ui_maintab.h" line="987"/>
- <location filename="../desktop-widgets/maintab.cpp" line="306"/>
- <source>Air temp.</source>
- <translation>Темп. воздуха</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="122"/>
- <location filename="../desktop-widgets/maintab.ui" line="855"/>
- <location filename="../build/ui_maintab.h" line="950"/>
- <location filename="../build/ui_maintab.h" line="989"/>
- <location filename="../desktop-widgets/maintab.cpp" line="307"/>
- <source>Water temp.</source>
- <translation>Темп. воды</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="18"/>
- <location filename="../desktop-widgets/maintab.ui" line="439"/>
- <location filename="../build/ui_maintab.h" line="961"/>
- <location filename="../build/ui_maintab.h" line="963"/>
- <location filename="../desktop-widgets/maintab.cpp" line="539"/>
- <location filename="../desktop-widgets/maintab.cpp" line="571"/>
- <source>Notes</source>
- <translation>Примечания</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="21"/>
- <location filename="../build/ui_maintab.h" line="964"/>
- <source>General notes about the current selection</source>
- <translation>Основная информация о выделенных погружениях</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="214"/>
- <source>Edit dive site</source>
- <translation>Редактирование сайта</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="217"/>
- <location filename="../build/ui_maintab.h" line="953"/>
- <source>...</source>
- <translation>...</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="491"/>
<location filename="../build/ui_maintab.h" line="965"/>
<source>Equipment</source>
@@ -4211,6 +4298,12 @@ p, li { white-space: pre-wrap; }
<translation>Информация о погружении</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="665"/>
+ <location filename="../build/ui_maintab.h" line="969"/>
+ <source>Interval</source>
+ <translation>Интервал</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="684"/>
<location filename="../build/ui_maintab.h" line="971"/>
<source>Gases used</source>
@@ -4223,18 +4316,38 @@ p, li { white-space: pre-wrap; }
<translation>Расход газа</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="722"/>
+ <location filename="../desktop-widgets/maintab.ui" line="1094"/>
+ <location filename="../build/ui_maintab.h" line="975"/>
+ <location filename="../build/ui_maintab.h" line="1003"/>
+ <source>SAC</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="741"/>
<location filename="../build/ui_maintab.h" line="977"/>
<source>CNS</source>
<translation>CNS</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="760"/>
+ <location filename="../build/ui_maintab.h" line="979"/>
+ <source>OTU</source>
+ <translation>OTU</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="779"/>
<location filename="../build/ui_maintab.h" line="981"/>
<source>Max. depth</source>
<translation>Макс. глубина</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="798"/>
+ <location filename="../build/ui_maintab.h" line="983"/>
+ <source>Avg. depth</source>
+ <translation>Сред. глубина</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="817"/>
<location filename="../build/ui_maintab.h" line="985"/>
<source>Air pressure</source>
@@ -4247,82 +4360,6 @@ p, li { white-space: pre-wrap; }
<translation>Время погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="933"/>
- <location filename="../build/ui_maintab.h" line="1007"/>
- <source>Simple statistics about the selection</source>
- <translation>Статистика выделенных погружений</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1039"/>
- <location filename="../build/ui_maintab.h" line="999"/>
- <source>Total time</source>
- <translation>Общее время</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1106"/>
- <location filename="../build/ui_maintab.h" line="1004"/>
- <source>Gas consumption</source>
- <translation>Расход газа</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1151"/>
- <location filename="../build/ui_maintab.h" line="1009"/>
- <source>All photos from the current selection</source>
- <translation>Все фото выделенных погружений</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1177"/>
- <location filename="../build/ui_maintab.h" line="1010"/>
- <source>Extra data</source>
- <translation>Дополнительно</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="1180"/>
- <location filename="../build/ui_maintab.h" line="1011"/>
- <source>Adittional data from the dive computer</source>
- <translation>Дополнительная информация из дайв-компьютера</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="92"/>
- <location filename="../desktop-widgets/maintab.ui" line="646"/>
- <location filename="../build/ui_maintab.h" line="947"/>
- <location filename="../build/ui_maintab.h" line="967"/>
- <source>Date</source>
- <translation>Дата</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="102"/>
- <location filename="../build/ui_maintab.h" line="948"/>
- <source>Time</source>
- <translation>Время</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="665"/>
- <location filename="../build/ui_maintab.h" line="969"/>
- <source>Interval</source>
- <translation>Интервал</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="722"/>
- <location filename="../desktop-widgets/maintab.ui" line="1094"/>
- <location filename="../build/ui_maintab.h" line="975"/>
- <location filename="../build/ui_maintab.h" line="1003"/>
- <source>SAC</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="798"/>
- <location filename="../build/ui_maintab.h" line="983"/>
- <source>Avg. depth</source>
- <translation>Сред. глубина</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/maintab.ui" line="760"/>
- <location filename="../build/ui_maintab.h" line="979"/>
- <source>OTU</source>
- <translation>OTU</translation>
- </message>
- <message>
<location filename="../desktop-widgets/maintab.ui" line="893"/>
<location filename="../build/ui_maintab.h" line="993"/>
<source>Salinity</source>
@@ -4335,22 +4372,34 @@ p, li { white-space: pre-wrap; }
<translation>Статистика</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="933"/>
+ <location filename="../build/ui_maintab.h" line="1007"/>
+ <source>Simple statistics about the selection</source>
+ <translation>Статистика выделенных погружений</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="986"/>
<location filename="../build/ui_maintab.h" line="996"/>
<source>Depth</source>
<translation>Глуб.</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="998"/>
+ <location filename="../build/ui_maintab.h" line="997"/>
+ <source>Duration</source>
+ <translation>Длительность</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1027"/>
<location filename="../build/ui_maintab.h" line="998"/>
<source>Temperature</source>
<translation>Температура</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.ui" line="998"/>
- <location filename="../build/ui_maintab.h" line="997"/>
- <source>Duration</source>
- <translation>Длительность</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1039"/>
+ <location filename="../build/ui_maintab.h" line="999"/>
+ <source>Total time</source>
+ <translation>Общее время</translation>
</message>
<message>
<location filename="../desktop-widgets/maintab.ui" line="1058"/>
@@ -4359,20 +4408,34 @@ p, li { white-space: pre-wrap; }
<translation>Погружения</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.ui" line="1106"/>
+ <location filename="../build/ui_maintab.h" line="1004"/>
+ <source>Gas consumption</source>
+ <translation>Расход газа</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.ui" line="1148"/>
<location filename="../build/ui_maintab.h" line="1008"/>
<source>Photos</source>
<translation>Фотографии</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="88"/>
- <source>Cylinders</source>
- <translation>Баллоны</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1151"/>
+ <location filename="../build/ui_maintab.h" line="1009"/>
+ <source>All photos from the current selection</source>
+ <translation>Все фото выделенных погружений</translation>
</message>
<message>
- <location filename="../desktop-widgets/maintab.cpp" line="92"/>
- <source>Weights</source>
- <translation>Грузы</translation>
+ <location filename="../desktop-widgets/maintab.ui" line="1177"/>
+ <location filename="../build/ui_maintab.h" line="1010"/>
+ <source>Extra data</source>
+ <translation>Дополнительно</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/maintab.ui" line="1180"/>
+ <location filename="../build/ui_maintab.h" line="1011"/>
+ <source>Adittional data from the dive computer</source>
+ <translation>Дополнительная информация из дайв-компьютера</translation>
</message>
<message>
<location filename="../desktop-widgets/maintab.cpp" line="63"/>
@@ -4385,11 +4448,21 @@ p, li { white-space: pre-wrap; }
<translation>Отменить изменения</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="88"/>
+ <source>Cylinders</source>
+ <translation>Баллоны</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="89"/>
<source>Add cylinder</source>
<translation>Добавить баллон</translation>
</message>
<message>
+ <location filename="../desktop-widgets/maintab.cpp" line="92"/>
+ <source>Weights</source>
+ <translation>Грузы</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/maintab.cpp" line="93"/>
<source>Add weight system</source>
<translation>Добавить грузовую систему</translation>
@@ -4582,659 +4655,685 @@ mixed from Air and using:
<translation>Файл</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="455"/>
- <location filename="../build/ui_mainwindow.h" line="534"/>
- <source>Export dive logs</source>
- <translation>Экспорт </translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="510"/>
- <location filename="../build/ui_mainwindow.h" line="542"/>
- <source>Toggle pHe graph</source>
- <translation>График pHe</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="546"/>
- <location filename="../build/ui_mainwindow.h" line="545"/>
- <source>Toggle calculating all tissues</source>
- <translation>Расчет всех тканей</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="522"/>
- <location filename="../build/ui_mainwindow.h" line="543"/>
- <source>Toggle DC reported ceiling</source>
- <translation>Потолок компьютера</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="534"/>
- <location filename="../build/ui_mainwindow.h" line="544"/>
- <source>Toggle calculated ceiling</source>
- <translation>Расчетный потолок</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="606"/>
- <location filename="../build/ui_mainwindow.h" line="550"/>
- <source>Toggle NDL, TTS</source>
- <translation>NDL, TTS</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="558"/>
- <location filename="../build/ui_mainwindow.h" line="546"/>
- <source>Toggle calculated ceiling with 3m increments</source>
- <translation>3м шаг для расчетного потолка</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="463"/>
- <location filename="../build/ui_mainwindow.h" line="537"/>
- <source>Configure &amp;dive computer</source>
- <translation>Настройки дайв-компьютера</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="570"/>
- <location filename="../build/ui_mainwindow.h" line="547"/>
- <source>Toggle heart rate</source>
- <translation>Пульс</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="582"/>
- <location filename="../build/ui_mainwindow.h" line="548"/>
- <source>Toggle MOD</source>
- <translation>MOD</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="594"/>
- <location filename="../build/ui_mainwindow.h" line="549"/>
- <source>Toggle EAD, END, EADD</source>
- <translation>EAD, END, EADD</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="618"/>
- <location filename="../build/ui_mainwindow.h" line="551"/>
- <source>Toggle SAC rate</source>
- <translation>SAC</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="630"/>
- <location filename="../build/ui_mainwindow.h" line="552"/>
- <source>Toggle ruler</source>
- <translation>Рулетка</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="86"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="87"/>
<location filename="../build/ui_mainwindow.h" line="569"/>
<source>&amp;Log</source>
<translation>Журнал</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="105"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="104"/>
<location filename="../build/ui_mainwindow.h" line="570"/>
<source>&amp;View</source>
<translation>Вид</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="121"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="120"/>
<location filename="../build/ui_mainwindow.h" line="571"/>
<source>&amp;Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="130"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="129"/>
<location filename="../build/ui_mainwindow.h" line="572"/>
<source>&amp;Import</source>
<translation>Импорт</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="139"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="138"/>
<location filename="../build/ui_mainwindow.h" line="573"/>
<source>&amp;Edit</source>
<translation>Редактирование</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="144"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="143"/>
<source>Share on</source>
<translation>Поделиться</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="158"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="157"/>
<location filename="../build/ui_mainwindow.h" line="453"/>
<source>&amp;New logbook</source>
<translation>Новый журнал</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="161"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="160"/>
<location filename="../build/ui_mainwindow.h" line="455"/>
<source>New</source>
<translation>Новый</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="164"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="163"/>
<location filename="../build/ui_mainwindow.h" line="457"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="169"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="168"/>
<location filename="../build/ui_mainwindow.h" line="458"/>
<source>&amp;Open logbook</source>
<translation>Открыть журнал</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="172"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="171"/>
<location filename="../build/ui_mainwindow.h" line="460"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="508"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="502"/>
<source>Open</source>
<translation>Открыть</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="175"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="174"/>
<location filename="../build/ui_mainwindow.h" line="462"/>
<source>Ctrl+O</source>
<translation>Ctrl+O</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="180"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="179"/>
<location filename="../build/ui_mainwindow.h" line="463"/>
<source>&amp;Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="183"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="182"/>
<location filename="../build/ui_mainwindow.h" line="465"/>
<source>Save</source>
<translation>Сохранить</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="186"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="185"/>
<location filename="../build/ui_mainwindow.h" line="467"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="191"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="190"/>
<location filename="../build/ui_mainwindow.h" line="468"/>
<source>Sa&amp;ve as</source>
<translation>Сохранить как</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="194"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="193"/>
<location filename="../build/ui_mainwindow.h" line="470"/>
<source>Save as</source>
<translation>Сохранить как</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="197"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="196"/>
<location filename="../build/ui_mainwindow.h" line="472"/>
<source>Ctrl+Shift+S</source>
<translation>Ctrl+Shift+S</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="202"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="201"/>
<location filename="../build/ui_mainwindow.h" line="473"/>
<source>&amp;Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="205"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="204"/>
<location filename="../build/ui_mainwindow.h" line="475"/>
<source>Close</source>
<translation>Закрыть</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="208"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="207"/>
<location filename="../build/ui_mainwindow.h" line="477"/>
<source>Ctrl+W</source>
<translation>Ctrl+W</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="221"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="212"/>
+ <location filename="../build/ui_mainwindow.h" line="478"/>
+ <source>&amp;Print</source>
+ <translation>Печать</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="215"/>
+ <location filename="../build/ui_mainwindow.h" line="479"/>
+ <source>Ctrl+P</source>
+ <translation>Ctrl+P</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="220"/>
<location filename="../build/ui_mainwindow.h" line="480"/>
<source>P&amp;references</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="251"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="223"/>
+ <location filename="../build/ui_mainwindow.h" line="481"/>
+ <source>Ctrl+,</source>
+ <translation>Ctrl+,</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="231"/>
+ <location filename="../build/ui_mainwindow.h" line="482"/>
+ <source>&amp;Quit</source>
+ <translation>Выход</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="234"/>
+ <location filename="../build/ui_mainwindow.h" line="483"/>
+ <source>Ctrl+Q</source>
+ <translation>Ctrl+Q</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="242"/>
+ <location filename="../build/ui_mainwindow.h" line="484"/>
+ <source>Import from &amp;dive computer</source>
+ <translation>Импорт из дайвкомпьютера</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="245"/>
+ <location filename="../build/ui_mainwindow.h" line="485"/>
+ <source>Ctrl+D</source>
+ <translation>Ctrl+D</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="250"/>
<location filename="../build/ui_mainwindow.h" line="486"/>
<source>Import &amp;GPS data from Subsurface web service</source>
<translation>Импорт координат из веб-сервиса Subsurface</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="259"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="253"/>
+ <location filename="../build/ui_mainwindow.h" line="487"/>
+ <source>Ctrl+G</source>
+ <translation>Ctrl+G</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="258"/>
<location filename="../build/ui_mainwindow.h" line="488"/>
<source>Edit device &amp;names</source>
<translation>Названия дайвкомпьютеров</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="272"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="263"/>
+ <location filename="../build/ui_mainwindow.h" line="489"/>
+ <source>&amp;Add dive</source>
+ <translation>Добавить погружение</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="266"/>
+ <location filename="../build/ui_mainwindow.h" line="490"/>
+ <source>Ctrl++</source>
+ <translation>Ctrl++</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="271"/>
<location filename="../build/ui_mainwindow.h" line="491"/>
<source>&amp;Edit dive</source>
<translation>Редактировать погружение</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="277"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="276"/>
<location filename="../build/ui_mainwindow.h" line="492"/>
<source>&amp;Copy dive components</source>
<translation>Копировать параметры погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="280"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="279"/>
<location filename="../build/ui_mainwindow.h" line="493"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="285"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="284"/>
<location filename="../build/ui_mainwindow.h" line="494"/>
<source>&amp;Paste dive components</source>
<translation>Вставить параметры погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="288"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="287"/>
<location filename="../build/ui_mainwindow.h" line="495"/>
<source>Ctrl+V</source>
<translation>Ctrl+V</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="325"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="292"/>
+ <location filename="../build/ui_mainwindow.h" line="496"/>
+ <source>&amp;Renumber</source>
+ <translation>Перенумеровать</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="295"/>
+ <location filename="../build/ui_mainwindow.h" line="497"/>
+ <source>Ctrl+R</source>
+ <translation>Ctrl+R</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="303"/>
+ <location filename="../build/ui_mainwindow.h" line="498"/>
+ <source>Auto &amp;group</source>
+ <translation>Авто-группировка</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="308"/>
+ <location filename="../build/ui_mainwindow.h" line="499"/>
+ <source>&amp;Yearly statistics</source>
+ <translation>Статистика по годам</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="311"/>
+ <location filename="../build/ui_mainwindow.h" line="500"/>
+ <source>Ctrl+Y</source>
+ <translation>Ctrl+Y</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="316"/>
+ <location filename="../build/ui_mainwindow.h" line="501"/>
+ <source>&amp;Dive list</source>
+ <translation>Список погружений</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="319"/>
+ <location filename="../build/ui_mainwindow.h" line="502"/>
+ <source>Ctrl+2</source>
+ <translation>Ctrl+2</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="324"/>
<location filename="../build/ui_mainwindow.h" line="503"/>
<source>&amp;Profile</source>
<translation>Профиль</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="333"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="327"/>
+ <location filename="../build/ui_mainwindow.h" line="504"/>
+ <source>Ctrl+3</source>
+ <translation>Ctrl+3</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="332"/>
<location filename="../build/ui_mainwindow.h" line="505"/>
<source>&amp;Info</source>
<translation>Информация</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="341"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="335"/>
+ <location filename="../build/ui_mainwindow.h" line="506"/>
+ <source>Ctrl+4</source>
+ <translation>Ctrl+4</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="340"/>
<location filename="../build/ui_mainwindow.h" line="507"/>
<source>&amp;All</source>
<translation>Все</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="357"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="343"/>
+ <location filename="../build/ui_mainwindow.h" line="508"/>
+ <source>Ctrl+1</source>
+ <translation>Ctrl+1</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="348"/>
+ <location filename="../build/ui_mainwindow.h" line="509"/>
+ <source>P&amp;revious DC</source>
+ <translation>Пред. компьютер</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="351"/>
+ <location filename="../build/ui_mainwindow.h" line="510"/>
+ <source>Left</source>
+ <translation>Влево</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="356"/>
<location filename="../build/ui_mainwindow.h" line="511"/>
<source>&amp;Next DC</source>
<translation>След. компьютер</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="365"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="359"/>
+ <location filename="../build/ui_mainwindow.h" line="512"/>
+ <source>Right</source>
+ <translation>Вправо</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="364"/>
<location filename="../build/ui_mainwindow.h" line="513"/>
<source>&amp;About Subsurface</source>
<translation>О Subsurface</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="381"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="372"/>
+ <location filename="../build/ui_mainwindow.h" line="514"/>
+ <source>User &amp;manual</source>
+ <translation>Руководство пользователя</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="375"/>
+ <location filename="../build/ui_mainwindow.h" line="515"/>
+ <source>F1</source>
+ <translation>F1</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="380"/>
<location filename="../build/ui_mainwindow.h" line="516"/>
<source>&amp;Globe</source>
<translation>Карта</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="403"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="383"/>
+ <location filename="../build/ui_mainwindow.h" line="517"/>
+ <source>Ctrl+5</source>
+ <translation>Ctrl+5</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="388"/>
+ <location filename="../build/ui_mainwindow.h" line="518"/>
+ <source>P&amp;lan dive</source>
+ <translation>Планировщик</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="391"/>
+ <location filename="../build/ui_mainwindow.h" line="519"/>
+ <source>Ctrl+L</source>
+ <translation>Ctrl+L</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="396"/>
+ <location filename="../build/ui_mainwindow.h" line="520"/>
+ <source>&amp;Import log files</source>
+ <translation>Импорт журналов</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="399"/>
+ <location filename="../build/ui_mainwindow.h" line="522"/>
+ <source>Import divelog files from other applications</source>
+ <translation>Импортировать журнал погружений из другой программы</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="402"/>
<location filename="../build/ui_mainwindow.h" line="524"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="408"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="407"/>
<location filename="../build/ui_mainwindow.h" line="525"/>
<source>Import &amp;from divelogs.de</source>
<translation>Импорт с сайта divelogs.de</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="416"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="415"/>
<location filename="../build/ui_mainwindow.h" line="526"/>
<source>&amp;Full screen</source>
<translation>Полный экран</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="419"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="418"/>
<location filename="../build/ui_mainwindow.h" line="528"/>
<source>Toggle full screen</source>
<translation>Переключить полноэкранный режим</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="447"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="421"/>
+ <location filename="../build/ui_mainwindow.h" line="530"/>
+ <source>F11</source>
+ <translation>F11</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="446"/>
<location filename="../build/ui_mainwindow.h" line="531"/>
<source>&amp;Check for updates</source>
<translation>Проверить обновления</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="452"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="451"/>
<location filename="../build/ui_mainwindow.h" line="532"/>
<source>&amp;Export</source>
<translation>Экспорт</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="458"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="454"/>
+ <location filename="../build/ui_mainwindow.h" line="534"/>
+ <source>Export dive logs</source>
+ <translation>Экспорт </translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="457"/>
<location filename="../build/ui_mainwindow.h" line="536"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="466"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="462"/>
+ <location filename="../build/ui_mainwindow.h" line="537"/>
+ <source>Configure &amp;dive computer</source>
+ <translation>Настройки дайв-компьютера</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="465"/>
<location filename="../build/ui_mainwindow.h" line="538"/>
<source>Ctrl+Shift+C</source>
<translation>Ctrl+Shift+C</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="474"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="473"/>
<location filename="../build/ui_mainwindow.h" line="539"/>
<source>Edit &amp;dive in planner</source>
<translation>Редактировать в планировщике</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="486"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="485"/>
<location filename="../build/ui_mainwindow.h" line="540"/>
<source>Toggle pO₂ graph</source>
<translation>График pO₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="498"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="497"/>
<location filename="../build/ui_mainwindow.h" line="541"/>
<source>Toggle pN₂ graph</source>
<translation>График pN₂</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="642"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="509"/>
+ <location filename="../build/ui_mainwindow.h" line="542"/>
+ <source>Toggle pHe graph</source>
+ <translation>График pHe</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="521"/>
+ <location filename="../build/ui_mainwindow.h" line="543"/>
+ <source>Toggle DC reported ceiling</source>
+ <translation>Потолок компьютера</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="533"/>
+ <location filename="../build/ui_mainwindow.h" line="544"/>
+ <source>Toggle calculated ceiling</source>
+ <translation>Расчетный потолок</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="545"/>
+ <location filename="../build/ui_mainwindow.h" line="545"/>
+ <source>Toggle calculating all tissues</source>
+ <translation>Расчет всех тканей</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="557"/>
+ <location filename="../build/ui_mainwindow.h" line="546"/>
+ <source>Toggle calculated ceiling with 3m increments</source>
+ <translation>3м шаг для расчетного потолка</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="569"/>
+ <location filename="../build/ui_mainwindow.h" line="547"/>
+ <source>Toggle heart rate</source>
+ <translation>Пульс</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="581"/>
+ <location filename="../build/ui_mainwindow.h" line="548"/>
+ <source>Toggle MOD</source>
+ <translation>MOD</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="593"/>
+ <location filename="../build/ui_mainwindow.h" line="549"/>
+ <source>Toggle EAD, END, EADD</source>
+ <translation>EAD, END, EADD</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="605"/>
+ <location filename="../build/ui_mainwindow.h" line="550"/>
+ <source>Toggle NDL, TTS</source>
+ <translation>NDL, TTS</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="617"/>
+ <location filename="../build/ui_mainwindow.h" line="551"/>
+ <source>Toggle SAC rate</source>
+ <translation>SAC</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="629"/>
+ <location filename="../build/ui_mainwindow.h" line="552"/>
+ <source>Toggle ruler</source>
+ <translation>Рулетка</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="641"/>
<location filename="../build/ui_mainwindow.h" line="553"/>
<source>Scale graph</source>
<translation>Альтернативный масштаб</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="654"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="653"/>
<location filename="../build/ui_mainwindow.h" line="554"/>
<source>Toggle pictures</source>
<translation>Фотографии</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="666"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="665"/>
<location filename="../build/ui_mainwindow.h" line="555"/>
<source>Toggle tank bar</source>
<translation>Замена смесей</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="674"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="673"/>
<location filename="../build/ui_mainwindow.h" line="556"/>
<source>&amp;Filter divelist</source>
<translation>Фильтр погружений</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="689"/>
- <location filename="../build/ui_mainwindow.h" line="558"/>
- <source>Toggle tissue graph</source>
- <translation>Насыщение тканей</translation>
+ <location filename="../desktop-widgets/mainwindow.ui" line="676"/>
+ <location filename="../build/ui_mainwindow.h" line="557"/>
+ <source>Ctrl+F</source>
+ <translation>Ctrl+F</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.ui" line="688"/>
+ <source>Toggle tissue heat-map</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="694"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="693"/>
<location filename="../build/ui_mainwindow.h" line="559"/>
<source>User &amp;survey</source>
<translation>Опрос пользователей</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="699"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="698"/>
<location filename="../build/ui_mainwindow.h" line="560"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="238"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="231"/>
<source>&amp;Undo</source>
<translation>Отменить</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="702"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="701"/>
<location filename="../build/ui_mainwindow.h" line="561"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="707"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="706"/>
<location filename="../build/ui_mainwindow.h" line="562"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="239"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="232"/>
<source>&amp;Redo</source>
<translation>Повторить</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="710"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="709"/>
<location filename="../build/ui_mainwindow.h" line="563"/>
<source>Ctrl+Shift+Z</source>
<translation>Ctrl+Shift+Z</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="715"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="714"/>
<location filename="../build/ui_mainwindow.h" line="564"/>
<source>&amp;Find moved images</source>
<translation>Найти перемещенные фото</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="720"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="719"/>
<source>Open c&amp;loud storage</source>
<translation>Открыть облачное хранилище</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="725"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="724"/>
<source>Save to clo&amp;ud storage</source>
<translation>Сохранить в облаке</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="730"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="729"/>
<location filename="../build/ui_mainwindow.h" line="567"/>
<source>&amp;Manage dive sites</source>
<translation>Управление дайв-сайтами</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="735"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="734"/>
<source>Dive Site &amp;Edit</source>
<translation>Редактирование дайв-сайта</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="740"/>
+ <location filename="../desktop-widgets/mainwindow.ui" line="739"/>
<source>Facebook</source>
<translation>Facebook</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="745"/>
- <source>Add GPS location here</source>
+ <location filename="../desktop-widgets/mainwindow.ui" line="744"/>
+ <source>Take cloud storage online</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="677"/>
- <location filename="../build/ui_mainwindow.h" line="557"/>
- <source>Ctrl+F</source>
- <translation>Ctrl+F</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="213"/>
- <location filename="../build/ui_mainwindow.h" line="478"/>
- <source>&amp;Print</source>
- <translation>Печать</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="224"/>
- <location filename="../build/ui_mainwindow.h" line="481"/>
- <source>Ctrl+,</source>
- <translation>Ctrl+,</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="232"/>
- <location filename="../build/ui_mainwindow.h" line="482"/>
- <source>&amp;Quit</source>
- <translation>Выход</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="243"/>
- <location filename="../build/ui_mainwindow.h" line="484"/>
- <source>Import from &amp;dive computer</source>
- <translation>Импорт из дайвкомпьютера</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="254"/>
- <location filename="../build/ui_mainwindow.h" line="487"/>
- <source>Ctrl+G</source>
- <translation>Ctrl+G</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="267"/>
- <location filename="../build/ui_mainwindow.h" line="490"/>
- <source>Ctrl++</source>
- <translation>Ctrl++</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="293"/>
- <location filename="../build/ui_mainwindow.h" line="496"/>
- <source>&amp;Renumber</source>
- <translation>Перенумеровать</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="296"/>
- <location filename="../build/ui_mainwindow.h" line="497"/>
- <source>Ctrl+R</source>
- <translation>Ctrl+R</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="312"/>
- <location filename="../build/ui_mainwindow.h" line="500"/>
- <source>Ctrl+Y</source>
- <translation>Ctrl+Y</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="392"/>
- <location filename="../build/ui_mainwindow.h" line="519"/>
- <source>Ctrl+L</source>
- <translation>Ctrl+L</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="216"/>
- <location filename="../build/ui_mainwindow.h" line="479"/>
- <source>Ctrl+P</source>
- <translation>Ctrl+P</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="235"/>
- <location filename="../build/ui_mainwindow.h" line="483"/>
- <source>Ctrl+Q</source>
- <translation>Ctrl+Q</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="246"/>
- <location filename="../build/ui_mainwindow.h" line="485"/>
- <source>Ctrl+D</source>
- <translation>Ctrl+D</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="264"/>
- <location filename="../build/ui_mainwindow.h" line="489"/>
- <source>&amp;Add dive</source>
- <translation>Добавить погружение</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="304"/>
- <location filename="../build/ui_mainwindow.h" line="498"/>
- <source>Auto &amp;group</source>
- <translation>Авто-группировка</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="309"/>
- <location filename="../build/ui_mainwindow.h" line="499"/>
- <source>&amp;Yearly statistics</source>
- <translation>Статистика по годам</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="317"/>
- <location filename="../build/ui_mainwindow.h" line="501"/>
- <source>&amp;Dive list</source>
- <translation>Список погружений</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="320"/>
- <location filename="../build/ui_mainwindow.h" line="502"/>
- <source>Ctrl+2</source>
- <translation>Ctrl+2</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="328"/>
- <location filename="../build/ui_mainwindow.h" line="504"/>
- <source>Ctrl+3</source>
- <translation>Ctrl+3</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="336"/>
- <location filename="../build/ui_mainwindow.h" line="506"/>
- <source>Ctrl+4</source>
- <translation>Ctrl+4</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="344"/>
- <location filename="../build/ui_mainwindow.h" line="508"/>
- <source>Ctrl+1</source>
- <translation>Ctrl+1</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="349"/>
- <location filename="../build/ui_mainwindow.h" line="509"/>
- <source>P&amp;revious DC</source>
- <translation>Пред. компьютер</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="352"/>
- <location filename="../build/ui_mainwindow.h" line="510"/>
- <source>Left</source>
- <translation>Влево</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="360"/>
- <location filename="../build/ui_mainwindow.h" line="512"/>
- <source>Right</source>
- <translation>Вправо</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="373"/>
- <location filename="../build/ui_mainwindow.h" line="514"/>
- <source>User &amp;manual</source>
- <translation>Руководство пользователя</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="376"/>
- <location filename="../build/ui_mainwindow.h" line="515"/>
- <source>F1</source>
- <translation>F1</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.ui" line="384"/>
- <location filename="../build/ui_mainwindow.h" line="517"/>
- <source>Ctrl+5</source>
- <translation>Ctrl+5</translation>
+ <location filename="../build/ui_mainwindow.h" line="558"/>
+ <source>Toggle tissue graph</source>
+ <translation>Насыщение тканей</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="389"/>
- <location filename="../build/ui_mainwindow.h" line="518"/>
- <source>P&amp;lan dive</source>
- <translation>Планировщик</translation>
+ <location filename="../build/ui_mainwindow.h" line="565"/>
+ <source>Open cloud storage</source>
+ <translation>Открыть облачное хранилище</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="397"/>
- <location filename="../build/ui_mainwindow.h" line="520"/>
- <source>&amp;Import log files</source>
- <translation>Импорт журналов</translation>
+ <location filename="../build/ui_mainwindow.h" line="566"/>
+ <source>Save to cloud storage</source>
+ <translation>Сохранить в облако</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="400"/>
- <location filename="../build/ui_mainwindow.h" line="522"/>
- <source>Import divelog files from other applications</source>
- <translation>Импортировать журнал погружений из другой программы</translation>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="331"/>
+ <source>Connect to</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.ui" line="422"/>
- <location filename="../build/ui_mainwindow.h" line="530"/>
- <source>F11</source>
- <translation>F11</translation>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="493"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="538"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1545"/>
+ <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="505"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
<source>Open file</source>
<translation>Открыть журнал</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="509"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="503"/>
<location filename="../desktop-widgets/mainwindow.cpp" line="614"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -5254,6 +5353,16 @@ mixed from Air and using:
<translation>Поиск изображений, подождите...</translation>
</message>
<message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Warning</source>
+ <translation>Предупреждение</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/mainwindow.cpp" line="674"/>
<source>Please save or cancel the current dive edit before closing the file.</source>
<translation>Сохраните или отмените изменения перед закрытием файла.</translation>
@@ -5269,125 +5378,98 @@ mixed from Air and using:
<translation>Печать плана погружения</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
+ <source>Trying to replan a dive that&apos;s not a planned dive.</source>
+ <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="977"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1849"/>
+ <source>Please, first finish the current edition before trying to do another.</source>
+ <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="983"/>
<source>Trying to edit a dive that&apos;s not a manually added dive.</source>
<translation>Попытка редактирования погружения, созданного не вручную.</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1243"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1030"/>
+ <source>Yearly statistics</source>
+ <translation>Статистика по годам</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1244"/>
<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="1246"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1247"/>
<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="1251"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
<source>Save changes?</source>
<translation>Сохранить изменения?</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1253"/>
+ <source>Changes will be lost if you don&apos;t save them.</source>
+ <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1572"/>
<source>Save file as</source>
<translation>Сохранить как</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1682"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1573"/>
+ <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
+ <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1670"/>
+ <source>[local cache for] %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1672"/>
<source>[cloud storage for] %1</source>
<translation>[облачное хранилище для] %1</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1782"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1788"/>
<source>Opening datafile from older version</source>
<translation>Журнал создан в старой версии</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1783"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1789"/>
<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="1794"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1800"/>
<source>Open dive log file</source>
<translation>Открыть журнал погружений</translation>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1795"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1801"/>
<source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1972"/>
+ <location filename="../desktop-widgets/mainwindow.cpp" line="1978"/>
<source>Contacting cloud service...</source>
<translation>Соединение с облачным сервисом...</translation>
</message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1252"/>
- <source>Changes will be lost if you don&apos;t save them.</source>
- <translation>Изменения будут утеряны, если вы не сохраните их.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="649"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="796"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="982"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Warning</source>
- <translation>Предупреждение</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="499"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="544"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/>
- <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="338"/>
- <source>Connect to</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="904"/>
- <source>Trying to replan a dive that&apos;s not a planned dive.</source>
- <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1029"/>
- <source>Yearly statistics</source>
- <translation>Статистика по годам</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/>
- <source>Subsurface XML files (*.ssrf *.xml *.XML)</source>
- <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/mainwindow.cpp" line="976"/>
- <location filename="../desktop-widgets/mainwindow.cpp" line="1843"/>
- <source>Please, first finish the current edition before trying to do another.</source>
- <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation>
- </message>
- <message>
- <location filename="../build/ui_mainwindow.h" line="565"/>
- <source>Open cloud storage</source>
- <translation>Открыть облачное хранилище</translation>
- </message>
- <message>
- <location filename="../build/ui_mainwindow.h" line="566"/>
- <source>Save to cloud storage</source>
- <translation>Сохранить в облако</translation>
- </message>
</context>
<context>
<name>MultiFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="733"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="731"/>
<source>Filter shows %1 (of %2) dives</source>
<translation>Показано %1 (из %2) погружений</translation>
</message>
@@ -5395,12 +5477,12 @@ Subsurface попытался перенести уже существующие
<context>
<name>OstcFirmwareCheck</name>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="269"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="271"/>
<source>You should update the firmware on your dive computer: you have version %1 but the latest stable version is %2</source>
<translation>Вам следует обновить прошивку дайвкомпьютера: текущая версия %1, а последняя стабильная версия %2</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="273"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
<source>
Please start Bluetooth on your OSTC Sport and do the same preparations as for a logbook download before continuing with the update</source>
@@ -5409,27 +5491,27 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
Включите Bluetooth на OSTC Sport и выполните такие же приготовления, что и для загрузки журнала, прежде чем продолжать обновление.</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="274"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="276"/>
<source>Not now</source>
<translation>Не сейчас</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="275"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
<source>Update firmware</source>
<translation>Обновить прошивку</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="277"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="279"/>
<source>Firmware upgrade notice</source>
<translation>Примечание по обновлению прошивки</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="295"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="297"/>
<source>Save the downloaded firmware as</source>
<translation>Сохранить загруженную прошивку как</translation>
</message>
<message>
- <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="296"/>
+ <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="298"/>
<source>HEX files (*.hex)</source>
<translation>Файлы HEX (*.hex)</translation>
</message>
@@ -5437,79 +5519,89 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PlannerSettingsWidget</name>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>Open circuit</source>
<translation>Открытый цикл</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>CCR</source>
<translation>CCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="322"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="302"/>
<source>pSCR</source>
<translation>pSCR</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="421"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="388"/>
<source>ft/min</source>
<translation>фут/мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="422"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="389"/>
<source>Last stop at 20ft</source>
<translation>Последняя остановка на 20фт</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="423"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="390"/>
<source>50% avg. depth to 20ft</source>
<translation>50% ср. глубины - 20фут</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="424"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="391"/>
<source>20ft to surface</source>
<translation>20фут - поверхность</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="426"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="392"/>
+ <source>ft</source>
+ <translation>фут</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="394"/>
<source>m/min</source>
<translation>м/мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="427"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="395"/>
<source>Last stop at 6m</source>
<translation>Последняя остановка на 6м</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="428"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="396"/>
<source>50% avg. depth to 6m</source>
<translation>50% ср. глубины - 6м</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="429"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="397"/>
<source>6m to surface</source>
<translation>6м - поверхность</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="432"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="433"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="398"/>
+ <source>m</source>
+ <translation>м</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="401"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="402"/>
<source>cuft/min</source>
<translation>куб.фут/мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="441"/>
- <location filename="../desktop-widgets/diveplanner.cpp" line="442"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="410"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="411"/>
<source>ℓ/min</source>
<translation>л/мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="451"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="420"/>
<source>bar</source>
<translation>бар</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="456"/>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="425"/>
<source>psi</source>
<translation>psi</translation>
</message>
@@ -5659,6 +5751,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PreferencesDialog</name>
<message>
+ <location filename="../build/ui_preferences.h" line="1283"/>
+ <source>Preferences</source>
+ <translation>Настройки</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1288"/>
<source>Defaults</source>
<translation>Общие</translation>
@@ -5694,6 +5791,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Геопоиск</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1303"/>
+ <source>Lists and tables</source>
+ <translation>Списки и таблицы</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1304"/>
<source>Font</source>
<translation>Шрифт</translation>
@@ -5709,6 +5811,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Погружения</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1307"/>
+ <source>Default dive log file</source>
+ <translation>Журнал по умолчанию</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1308"/>
<source>No default file</source>
<translation>Отсутствует</translation>
@@ -5739,6 +5846,21 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>...</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1314"/>
+ <source>Display invalid</source>
+ <translation>Показывать ошибочные</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1316"/>
+ <source>Default cylinder</source>
+ <translation>Баллон по умолчанию</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1317"/>
+ <source>Use default cylinder</source>
+ <translation>Использовать по умолчанию</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1318"/>
<source>Animations</source>
<translation>Анимация</translation>
@@ -5769,40 +5891,24 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Система мер</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1401"/>
- <source>Dive site geo lookup</source>
- <translation>Геопоиск дайв-сайтов</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1402"/>
- <source>Enable geocoding for dive site management</source>
- <translation>Включить геокодирование для дайв-сайтов</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1403"/>
- <source>Parse site without GPS data</source>
- <translation>Искать сайты без координат GPS</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1404"/>
- <source>Same format for existing dives</source>
- <translation>Один формат для существующих погружений</translation>
+ <location filename="../build/ui_preferences.h" line="1324"/>
+ <source>&amp;Metric</source>
+ <translation>Метрическая</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1405"/>
- <source>Dive Site Layout</source>
- <translation>Формат названия дайв-сайта</translation>
+ <location filename="../build/ui_preferences.h" line="1325"/>
+ <source>Imperial</source>
+ <translation>Имперская</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1406"/>
- <location filename="../build/ui_preferences.h" line="1407"/>
- <source>/</source>
- <translation>/</translation>
+ <location filename="../build/ui_preferences.h" line="1326"/>
+ <source>Personali&amp;ze</source>
+ <translation>Персональная</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1325"/>
- <source>Imperial</source>
- <translation>Имперская</translation>
+ <location filename="../build/ui_preferences.h" line="1327"/>
+ <source>Individual settings</source>
+ <translation>Индивидуальные настройки</translation>
</message>
<message>
<location filename="../build/ui_preferences.h" line="1328"/>
@@ -5820,6 +5926,11 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>фут</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1331"/>
+ <source>Pressure</source>
+ <translation>Давление</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1332"/>
<location filename="../build/ui_preferences.h" line="1366"/>
<source>bar</source>
@@ -5831,11 +5942,26 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>psi</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1334"/>
+ <source>Volume</source>
+ <translation>Объем</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1335"/>
+ <source>&amp;liter</source>
+ <translation>литр</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1336"/>
<source>cu ft</source>
<translation>куб. фут</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1337"/>
+ <source>Temperature</source>
+ <translation>Температура</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1338"/>
<source>celsius</source>
<translation>цельсий</translation>
@@ -5846,11 +5972,121 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>фаренгейт</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1340"/>
+ <source>Weight</source>
+ <translation>Вес</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1341"/>
<source>kg</source>
<translation>кг</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1342"/>
+ <source>lbs</source>
+ <translation>фунт</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1343"/>
+ <source>Time units</source>
+ <translation>Единицы времени</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1344"/>
+ <source>Ascent/descent speed denominator</source>
+ <translation>Делитель скорости спуска/подъема</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1345"/>
+ <source>Minutes</source>
+ <translation>Минуты</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1346"/>
+ <source>Seconds</source>
+ <translation>Секунды</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1347"/>
+ <source>GPS coordinates</source>
+ <translation>Координаты GPS</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1348"/>
+ <source>Location Display</source>
+ <translation>Отображение координат</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1349"/>
+ <source>traditional (dms)</source>
+ <translation>обычное (гмс)</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1350"/>
+ <source>decimal</source>
+ <translation>десятичное</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1351"/>
+ <source>Show</source>
+ <translation>Показывать</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1352"/>
+ <source>Threshold when showing pO₂</source>
+ <translation>Предельное значение pO₂</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1353"/>
+ <source>Threshold when showing pN₂</source>
+ <translation>Предельное значение pN₂</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1354"/>
+ <source>Threshold when showing pHe</source>
+ <translation>Предельное значение pHe</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1355"/>
+ <source>Max pO₂ when showing MOD</source>
+ <translation>Макс. pO₂ при отображении MOD</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1356"/>
+ <source>Draw dive computer reported ceiling red</source>
+ <translation>Показывать потолок дайвкомпьютера красным</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1357"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Показывать неиспользуемые баллоны</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1358"/>
+ <source>Show average depth</source>
+ <translation>Показывать среднюю глубину</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1359"/>
+ <source>Misc</source>
+ <translation>Разное</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1360"/>
+ <source>GFLow</source>
+ <translation>GFLow</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1361"/>
+ <source>GFHigh</source>
+ <translation>GFHigh</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_preferences.h" line="1362"/>
+ <source>GFLow at max depth</source>
+ <translation>GFLow на макс. грубине</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1363"/>
<source>CCR: show setpoints when viewing pO₂</source>
<translation>CCR: показывать установки</translation>
@@ -5896,14 +6132,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Системные настройки</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1374"/>
+ <source>Filter</source>
+ <translation>Фильтр</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1375"/>
<source>Proxy</source>
<translation>Прокси</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1379"/>
- <source>Proxy type</source>
- <translation>Тип прокси</translation>
+ <location filename="../build/ui_preferences.h" line="1376"/>
+ <source>Port</source>
+ <translation>Порт</translation>
</message>
<message>
<location filename="../build/ui_preferences.h" line="1377"/>
@@ -5911,16 +6152,16 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Хост</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1376"/>
- <source>Port</source>
- <translation>Порт</translation>
- </message>
- <message>
<location filename="../build/ui_preferences.h" line="1378"/>
<source>Requires authentication</source>
<translation>Требуется авторизация</translation>
</message>
<message>
+ <location filename="../build/ui_preferences.h" line="1379"/>
+ <source>Proxy type</source>
+ <translation>Тип прокси</translation>
+ </message>
+ <message>
<location filename="../build/ui_preferences.h" line="1380"/>
<source>Username</source>
<translation>Пользователь</translation>
@@ -5932,46 +6173,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Пароль</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1400"/>
- <source>Disconnect from Facebook</source>
- <translation>Отключиться от Facebook</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1374"/>
- <source>Filter</source>
- <translation>Фильтр</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1331"/>
- <source>Pressure</source>
- <translation>Давление</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1303"/>
- <source>Lists and tables</source>
- <translation>Списки и таблицы</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1307"/>
- <source>Default dive log file</source>
- <translation>Журнал по умолчанию</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1314"/>
- <source>Display invalid</source>
- <translation>Показывать ошибочные</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1316"/>
- <source>Default cylinder</source>
- <translation>Баллон по умолчанию</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1317"/>
- <source>Use default cylinder</source>
- <translation>Использовать по умолчанию</translation>
- </message>
- <message>
<location filename="../build/ui_preferences.h" line="1382"/>
<source>Subsurface cloud storage</source>
<translation>Облачное хранилище Subsurface</translation>
@@ -6012,149 +6213,40 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Сохранять ID пользователя</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1334"/>
- <source>Volume</source>
- <translation>Объем</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1337"/>
- <source>Temperature</source>
- <translation>Температура</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1340"/>
- <source>Weight</source>
- <translation>Вес</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1342"/>
- <source>lbs</source>
- <translation>фунт</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1343"/>
- <source>Time units</source>
- <translation>Единицы времени</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1345"/>
- <source>Minutes</source>
- <translation>Минуты</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1346"/>
- <source>Seconds</source>
- <translation>Секунды</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1351"/>
- <source>Show</source>
- <translation>Показывать</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1362"/>
- <source>GFLow at max depth</source>
- <translation>GFLow на макс. грубине</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1359"/>
- <source>Misc</source>
- <translation>Разное</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1283"/>
- <source>Preferences</source>
- <translation>Настройки</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1324"/>
- <source>&amp;Metric</source>
- <translation>Метрическая</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1326"/>
- <source>Personali&amp;ze</source>
- <translation>Персональная</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1327"/>
- <source>Individual settings</source>
- <translation>Индивидуальные настройки</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1335"/>
- <source>&amp;liter</source>
- <translation>литр</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1344"/>
- <source>Ascent/descent speed denominator</source>
- <translation>Делитель скорости спуска/подъема</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1347"/>
- <source>GPS coordinates</source>
- <translation>Координаты GPS</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1348"/>
- <source>Location Display</source>
- <translation>Отображение координат</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1349"/>
- <source>traditional (dms)</source>
- <translation>обычное (гмс)</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1350"/>
- <source>decimal</source>
- <translation>десятичное</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1352"/>
- <source>Threshold when showing pO₂</source>
- <translation>Предельное значение pO₂</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1353"/>
- <source>Threshold when showing pN₂</source>
- <translation>Предельное значение pN₂</translation>
- </message>
- <message>
- <location filename="../build/ui_preferences.h" line="1354"/>
- <source>Threshold when showing pHe</source>
- <translation>Предельное значение pHe</translation>
+ <location filename="../build/ui_preferences.h" line="1400"/>
+ <source>Disconnect from Facebook</source>
+ <translation>Отключиться от Facebook</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1355"/>
- <source>Max pO₂ when showing MOD</source>
- <translation>Макс. pO₂ при отображении MOD</translation>
+ <location filename="../build/ui_preferences.h" line="1401"/>
+ <source>Dive site geo lookup</source>
+ <translation>Геопоиск дайв-сайтов</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1356"/>
- <source>Draw dive computer reported ceiling red</source>
- <translation>Показывать потолок дайвкомпьютера красным</translation>
+ <location filename="../build/ui_preferences.h" line="1402"/>
+ <source>Enable geocoding for dive site management</source>
+ <translation>Включить геокодирование для дайв-сайтов</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1357"/>
- <source>Show unused cylinders in Equipment tab</source>
- <translation>Показывать неиспользуемые баллоны</translation>
+ <location filename="../build/ui_preferences.h" line="1403"/>
+ <source>Parse site without GPS data</source>
+ <translation>Искать сайты без координат GPS</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1358"/>
- <source>Show average depth</source>
- <translation>Показывать среднюю глубину</translation>
+ <location filename="../build/ui_preferences.h" line="1404"/>
+ <source>Same format for existing dives</source>
+ <translation>Один формат для существующих погружений</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1360"/>
- <source>GFLow</source>
- <translation>GFLow</translation>
+ <location filename="../build/ui_preferences.h" line="1405"/>
+ <source>Dive Site Layout</source>
+ <translation>Формат названия дайв-сайта</translation>
</message>
<message>
- <location filename="../build/ui_preferences.h" line="1361"/>
- <source>GFHigh</source>
- <translation>GFHigh</translation>
+ <location filename="../build/ui_preferences.h" line="1406"/>
+ <location filename="../build/ui_preferences.h" line="1407"/>
+ <source>/</source>
+ <translation>/</translation>
</message>
</context>
<context>
@@ -6210,106 +6302,136 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="20"/>
- <source>Show</source>
- <translation>Показывать</translation>
+ <source>Gas pressure display setup</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="29"/>
- <source>Threshold when showing pO₂</source>
- <translation>Предельное значение pO₂</translation>
+ <source>Threshold for pO₂ (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="49"/>
- <source>Threshold when showing pN₂</source>
- <translation>Предельное значение pN₂</translation>
+ <source>Threshold for pN₂ (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="69"/>
- <source>Threshold when showing pHe</source>
- <translation>Предельное значение pHe</translation>
+ <source>Threshold for pHe (bar)</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_graph.ui" line="89"/>
- <source>Max pO₂ when showing MOD</source>
- <translation>Макс. pO₂ при отображении MOD</translation>
+ <source>pO₂ in calculating MOD (bar)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="106"/>
+ <source>CCR options:</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="113"/>
+ <source>Dive planner default setpoint (bar)</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
+ <source>Show setpoints when viewing pO₂</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="109"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="140"/>
+ <source>Show individual O₂ sensor values when viewing pO₂</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="150"/>
+ <source>Ceiling display setup</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="159"/>
<source>Draw dive computer reported ceiling red</source>
<translation>Показывать потолок дайвкомпьютера красным</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="116"/>
- <source>Show unused cylinders in Equipment tab</source>
- <translation>Показывать неиспользуемые баллоны</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="169"/>
+ <source>Algorithm for calculated ceiling:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="123"/>
- <source>Show mean depth</source>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="176"/>
+ <source>VPM-B</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="133"/>
- <source>Misc</source>
- <translation>Разное</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="183"/>
+ <source>VPM-B Conservatism</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="149"/>
- <source>bar</source>
- <translation>бар</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="193"/>
+ <source>+</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="165"/>
- <source>Default CCR set-point for dive planning</source>
- <translation>Установка CCR по умолчанию для планировщика</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="206"/>
+ <source>Bühlmann</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="172"/>
- <source>pSCR O₂ metabolism rate</source>
- <translation>pSCR метаболизм O₂</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="216"/>
+ <source>GFHigh</source>
+ <translation>GFHigh</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="179"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="236"/>
<source>GFLow</source>
<translation>GFLow</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="186"/>
- <source>GFHigh</source>
- <translation>GFHigh</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="256"/>
+ <source>GFLow at max depth</source>
+ <translation>GFLow на макс. грубине</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="203"/>
- <source>ℓ/min</source>
- <translation>л/мин</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="263"/>
+ <source>pSCR options:</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="213"/>
- <source>pSCR ratio</source>
- <translation>pSCR отношение сброса</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="270"/>
+ <source>Metabolic rate (ℓ O₂/min)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="223"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="287"/>
+ <source>Dilution ratio</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="300"/>
<source>1:</source>
<translation>1:</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="230"/>
- <source>CCR: show individual O₂ sensor values when viewing pO₂</source>
- <translation>CCR: индивидуальные значения сенсоров O₂</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="310"/>
+ <source>Misc</source>
+ <translation>Разное</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="237"/>
- <source>CCR: show setpoints when viewing pO₂</source>
- <translation>CCR: показывать установки</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="316"/>
+ <source>Show unused cylinders in Equipment tab</source>
+ <translation>Показывать неиспользуемые баллоны</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="244"/>
- <source>GFLow at max depth</source>
- <translation>GFLow на макс. грубине</translation>
+ <location filename="../desktop-widgets/preferences/preferences_graph.ui" line="323"/>
+ <source>Show mean depth in Profile</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="10"/>
+ <location filename="../desktop-widgets/preferences/preferences_graph.cpp" line="9"/>
<source>Graph</source>
<translation>Профиль</translation>
</message>
@@ -6378,15 +6500,29 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Язык</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="57"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="53"/>
<source>Restart required</source>
<translation>Необходим перезапуск</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="54"/>
<source>To correctly load a new language you must restart Subsurface.</source>
<translation>Для смены языка необходимо перезапустить Subsurface.</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/>
+ <source>Literal characters</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="77"/>
+ <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="83"/>
+ <source>Non-special character(s) in time format.
+These will be used as is. This might not be what you intended.
+See http://doc.qt.io/qt-5/qdatetime.html#toString</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>PreferencesNetwork</name>
@@ -6433,7 +6569,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
</message>
<message>
<location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="148"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="134"/>
<source>Subsurface cloud storage</source>
<translation>Облачное хранилище Subsurface</translation>
</message>
@@ -6478,39 +6614,39 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Сохранять ID пользователя</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="11"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="10"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="15"/>
<source>No proxy</source>
<translation>Без прокси</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="16"/>
<source>System proxy</source>
<translation>Системный прокси</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="17"/>
<source>HTTP proxy</source>
<translation>HTTP прокси</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="19"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="18"/>
<source>SOCKS proxy</source>
<translation>SOCKS прокси</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="75"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="97"/>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="110"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="93"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="106"/>
<source>Cloud storage email and password can only consist of letters, numbers, and &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, and &apos;+&apos;.</source>
<translation>Адрес почты и пароль для могут содержать только буквы, цифры и &apos;.&apos;, &apos;-&apos;, &apos;_&apos;, и &apos;+&apos;.</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="146"/>
+ <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="132"/>
<source>Subsurface cloud storage (credentials verified)</source>
<translation>Облачное хранилище Subsurface (данные подтверждены)</translation>
</message>
@@ -6668,7 +6804,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>десятичное</translation>
</message>
<message>
- <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="8"/>
+ <location filename="../desktop-widgets/preferences/preferences_units.cpp" line="7"/>
<source>Units</source>
<translation>Единицы</translation>
</message>
@@ -6676,17 +6812,17 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PrintDialog</name>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="118"/>
- <source>&amp;Preview</source>
- <translation>Просмотр</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/printdialog.cpp" line="115"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="102"/>
<source>P&amp;rint</source>
<translation>Печать</translation>
</message>
<message>
- <location filename="../desktop-widgets/printdialog.cpp" line="130"/>
+ <location filename="../desktop-widgets/printdialog.cpp" line="105"/>
+ <source>&amp;Preview</source>
+ <translation>Просмотр</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/printdialog.cpp" line="117"/>
<source>Print</source>
<translation>Печать</translation>
</message>
@@ -6694,19 +6830,10 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>PrintOptions</name>
<message>
- <location filename="../build/ui_printoptions.h" line="150"/>
- <source>&amp;Table print</source>
- <translation>Таблица</translation>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="158"/>
- <source>One dive per page</source>
- <translation>Одно погружение на странице</translation>
- </message>
- <message>
- <location filename="../build/ui_printoptions.h" line="159"/>
- <source>Two dives per page</source>
- <translation>Одно погружения на странице</translation>
+ <location filename="../desktop-widgets/printoptions.ui" line="29"/>
+ <location filename="../build/ui_printoptions.h" line="148"/>
+ <source>Print type</source>
+ <translation>Варианты печати</translation>
</message>
<message>
<location filename="../desktop-widgets/printoptions.ui" line="41"/>
@@ -6766,10 +6893,19 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Импорт</translation>
</message>
<message>
- <location filename="../desktop-widgets/printoptions.ui" line="29"/>
- <location filename="../build/ui_printoptions.h" line="148"/>
- <source>Print type</source>
- <translation>Варианты печати</translation>
+ <location filename="../build/ui_printoptions.h" line="150"/>
+ <source>&amp;Table print</source>
+ <translation>Таблица</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="158"/>
+ <source>One dive per page</source>
+ <translation>Одно погружение на странице</translation>
+ </message>
+ <message>
+ <location filename="../build/ui_printoptions.h" line="159"/>
+ <source>Two dives per page</source>
+ <translation>Одно погружения на странице</translation>
</message>
<message>
<location filename="../desktop-widgets/printoptions.cpp" line="128"/>
@@ -6811,103 +6947,103 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>Неизвестный дайвкомпьютер</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="755"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="752"/>
<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="1344"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1338"/>
<source>Make first divecomputer</source>
<translation>Сделать первым компьютером</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1346"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1340"/>
<source>Delete this divecomputer</source>
<translation>Удалить этот дайвкомпьютер</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1360"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1354"/>
<source>Add gas change</source>
<translation>Добавить замену газа</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1363"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1357"/>
<source> (Tank %1)</source>
<translation> (Баллон %1)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1365"/>
<source>Add set-point change</source>
<translation>Добавить замену установки</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1373"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1367"/>
<source>Add bookmark</source>
<translation>Добавить закладку</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1377"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1371"/>
<source>Edit the profile</source>
<translation>Редактировать профиль</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1381"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1375"/>
<source>Remove event</source>
<translation>Удалить событие</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1386"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1380"/>
<source>Hide similar events</source>
<translation>Скрыть похожие события</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1393"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1387"/>
<source>Edit name</source>
<translation>Изменить закладку</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1422"/>
- <location filename="../profile-widget/profilewidget2.cpp" line="1429"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1416"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1423"/>
<source>Adjust pressure of tank %1 (currently interpolated as %2)</source>
<translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1444"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1438"/>
<source>Unhide all events</source>
<translation>Показать все события</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide events</source>
<translation>Скрыть событие</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1479"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1473"/>
<source>Hide all %1 events?</source>
<translation>Спрятать все %1 события?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1514"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1508"/>
<source>Remove the selected event?</source>
<translation>Удалить выбранное событие?</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1515"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1509"/>
<source>%1 @ %2:%3</source>
<translation>%1 @ %2:%3</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1632"/>
<source>Edit name of bookmark</source>
<translation>Изменить закладку</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1639"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1633"/>
<source>Custom name:</source>
<translation>Название:</translation>
</message>
<message>
- <location filename="../profile-widget/profilewidget2.cpp" line="1644"/>
+ <location filename="../profile-widget/profilewidget2.cpp" line="1638"/>
<source>Name is too long!</source>
<translation>Слишком длинное название!</translation>
</message>
@@ -6915,91 +7051,101 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>QMLManager</name>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="95"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="97"/>
<source>Starting...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/>
<source>working in no-cloud mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="213"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/>
<source>no cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="214"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="270"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/>
<source>Please enter valid cloud credentials.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="285"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/>
<source>Attempting to open cloud storage with new credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="304"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/>
<source>Testing cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/>
+ <source>No response from cloud server to validate the credentials</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/>
+ <source>Cannot connect to cloud storage - cloud account not verified</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/>
<source>Cloud credentials are invalid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="344"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/>
<source>Cannot open cloud storage: Error creating https connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="357"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/>
<source>Cannot open cloud storage: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="369"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/>
<source>Cannot connect to cloud storage</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="411"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/>
<source>Cloud storage error: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="501"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/>
<source>Failed to connect to cloud server, reverting to no cloud status</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="520"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/>
<source>Cloud storage open successfully. No dives in dive list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
<source>h</source>
- <translation type="unfinished"/>
+ <translation>ч</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="690"/>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="691"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/>
<source>min</source>
<translation>мин</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/>
<source>sec</source>
- <translation type="unfinished"/>
+ <translation>с</translation>
</message>
<message>
- <location filename="../mobile-widgets/qmlmanager.cpp" line="1041"/>
+ <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/>
<source>Unknown GPS location</source>
<translation type="unfinished"/>
</message>
@@ -7007,126 +7153,126 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>QObject</name>
<message>
- <location filename="../core/qthelper.cpp" line="866"/>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>AIR</source>
- <translation>воздух</translation>
+ <location filename="../core/gpslocation.h" line="13"/>
+ <source>Waiting to aquire GPS location</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1214"/>
- <source>OXYGEN</source>
- <translation>КИСЛОРОД</translation>
+ <location filename="../core/qthelper.cpp" line="766"/>
+ <location filename="../core/qthelper.cpp" line="1275"/>
+ <source>m</source>
+ <translation>м</translation>
</message>
<message>
- <location filename="../desktop-widgets/diveplanner.cpp" line="59"/>
- <source>Remove this point</source>
- <translation>Удалить эту точку</translation>
+ <location filename="../core/qthelper.cpp" line="768"/>
+ <location filename="../core/qthelper.cpp" line="1274"/>
+ <source>ft</source>
+ <translation>фут</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
- <source>Average</source>
- <translation>Среднее</translation>
+ <location filename="../core/qthelper.cpp" line="794"/>
+ <source>C</source>
+ <translation>C</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
- <source>Minimum</source>
- <translation>Минимум</translation>
+ <location filename="../core/qthelper.cpp" line="796"/>
+ <source>F</source>
+ <translation>F</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
- <source>Maximum</source>
- <translation>Максимум</translation>
+ <location filename="../core/qthelper.cpp" line="821"/>
+ <location filename="../core/qthelper.cpp" line="1250"/>
+ <source>kg</source>
+ <translation>кг</translation>
</message>
<message>
- <location filename="../desktop-widgets/globe.cpp" line="327"/>
- <source>Move the map and double-click to set the dive location</source>
- <translation>Выберите место на карте двойным щелчком мыши.</translation>
+ <location filename="../core/qthelper.cpp" line="823"/>
+ <location filename="../core/qthelper.cpp" line="1251"/>
+ <source>lbs</source>
+ <translation>фунт</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="28"/>
- <source>unknown</source>
- <translation>неизвестно</translation>
+ <location filename="../core/qthelper.cpp" line="848"/>
+ <location filename="../core/qthelper.cpp" line="1300"/>
+ <source>bar</source>
+ <translation>бар</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>h:</source>
- <translation>ч:</translation>
+ <location filename="../core/qthelper.cpp" line="850"/>
+ <location filename="../core/qthelper.cpp" line="1299"/>
+ <source>psi</source>
+ <translation>psi</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="105"/>
- <source>min</source>
- <translation>мин</translation>
+ <location filename="../core/qthelper.cpp" line="871"/>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>AIR</source>
+ <translation>воздух</translation>
</message>
<message>
- <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="337"/>
- <source>Multiple</source>
- <translation type="unfinished"/>
+ <location filename="../core/qthelper.cpp" line="873"/>
+ <source>EAN</source>
+ <translation>EAN</translation>
</message>
<message numerus="yes">
- <location filename="../core/qthelper.cpp" line="957"/>
+ <location filename="../core/qthelper.cpp" line="962"/>
<source>(%n dive(s))</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="816"/>
- <location filename="../core/qthelper.cpp" line="1228"/>
- <source>kg</source>
- <translation>кг</translation>
+ <location filename="../core/qthelper.cpp" line="1235"/>
+ <source>OXYGEN</source>
+ <translation>КИСЛОРОД</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="818"/>
- <location filename="../core/qthelper.cpp" line="1229"/>
- <source>lbs</source>
- <translation>фунт</translation>
+ <location filename="../core/qthelper.cpp" line="1322"/>
+ <source>l</source>
+ <translation>л</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="763"/>
- <location filename="../core/qthelper.cpp" line="1252"/>
- <source>ft</source>
- <translation>фут</translation>
+ <location filename="../core/qthelper.cpp" line="1323"/>
+ <source>cuft</source>
+ <translation>куб. фут</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="761"/>
- <location filename="../core/qthelper.cpp" line="1253"/>
- <source>m</source>
- <translation>м</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="29"/>
+ <source>unknown</source>
+ <translation>неизвестно</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="789"/>
- <source>C</source>
- <translation>C</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>h:</source>
+ <translation>ч:</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="791"/>
- <source>F</source>
- <translation>F</translation>
+ <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="114"/>
+ <source>min</source>
+ <translation>мин</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="845"/>
- <location filename="../core/qthelper.cpp" line="1275"/>
- <source>psi</source>
- <translation>psi</translation>
+ <location filename="../desktop-widgets/diveplanner.cpp" line="63"/>
+ <source>Remove this point</source>
+ <translation>Удалить эту точку</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="843"/>
- <location filename="../core/qthelper.cpp" line="1276"/>
- <source>bar</source>
- <translation>бар</translation>
+ <location filename="../desktop-widgets/globe.cpp" line="327"/>
+ <source>Move the map and double-click to set the dive location</source>
+ <translation>Выберите место на карте двойным щелчком мыши.</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="868"/>
- <source>EAN</source>
- <translation type="unfinished"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="32"/>
+ <source>Average</source>
+ <translation>Среднее</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1298"/>
- <source>l</source>
- <translation>л</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="35"/>
+ <source>Minimum</source>
+ <translation>Минимум</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="1299"/>
- <source>cuft</source>
- <translation>куб. фут</translation>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="38"/>
+ <source>Maximum</source>
+ <translation>Максимум</translation>
</message>
<message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="625"/>
@@ -7148,17 +7294,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<source>Malformed XML response. Line %1: %2</source>
<translation>Неверный XML ответ. Строка %1: %2</translation>
</message>
- <message>
- <location filename="../core/gpslocation.h" line="13"/>
- <source>Waiting to aquire GPS location</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>ReadSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1651"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1676"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1640"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1665"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
</message>
@@ -7187,7 +7328,7 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>ResetSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1775"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1764"/>
<source>Reset settings failed!</source>
<translation>Сброс настроек не удался!</translation>
</message>
@@ -7225,6 +7366,12 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<context>
<name>ShiftImageTimesDialog</name>
<message>
+ <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
+ <location filename="../build/ui_shiftimagetimes.h" line="184"/>
+ <source>Shift selected image times</source>
+ <translation>Сдвинуть время изображений</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="34"/>
<location filename="../build/ui_shiftimagetimes.h" line="185"/>
<source>Shift times of image(s) by</source>
@@ -7237,12 +7384,6 @@ Please start Bluetooth on your OSTC Sport and do the same preparations as for a
<translation>h:mm</translation>
</message>
<message>
- <location filename="../desktop-widgets/shiftimagetimes.ui" line="23"/>
- <location filename="../build/ui_shiftimagetimes.h" line="184"/>
- <source>Shift selected image times</source>
- <translation>Сдвинуть время изображений</translation>
- </message>
- <message>
<location filename="../desktop-widgets/shiftimagetimes.ui" line="105"/>
<location filename="../build/ui_shiftimagetimes.h" line="187"/>
<source>Earlier</source>
@@ -7294,12 +7435,12 @@ Not all images have timestamps in the range between
<translation>Какое время и дата отображены на изображении?</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="297"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="296"/>
<source>Open image file</source>
<translation>Открыть файл с изображением</translation>
</message>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="299"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="298"/>
<source>Image files (*.jpg *.jpeg *.pnm *.tif *.tiff)</source>
<translation>Файлы изображений (*.jpg *.jpeg *.pnm *.tif *.tiff)</translation>
</message>
@@ -7457,54 +7598,54 @@ Not all images have timestamps in the range between
<context>
<name>SocialNetworkDialog</name>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="339"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="284"/>
<source>Dive date: %1
</source>
<translation>Дата погружения: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="342"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="287"/>
<source>Duration: %1
</source>
<translation>Длительность: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="343"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/>
<source>h:</source>
<comment>abbreviation for hours plus separator</comment>
<translation>ч:</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="344"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="289"/>
<source>min</source>
<comment>abbreviation for minutes</comment>
<translation>мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="347"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="292"/>
<source>Dive location: %1
</source>
<translation>Местоположение: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="350"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="295"/>
<source>Buddy: %1
</source>
<translation>Партнер: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="353"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="298"/>
<source>Divemaster: %1
</source>
<translation>Дайвмастер: %1
</translation>
</message>
<message>
- <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="356"/>
+ <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="301"/>
<source>
%1</source>
<translation>
@@ -7590,9 +7731,20 @@ Not all images have timestamps in the range between
<name>StartPage</name>
<message>
<location filename="../mobile-widgets/qml/StartPage.qml" line="19"/>
- <source>To use Subsurface-mobile with Subsurface cloud storage, please enteryour cloud credentials.
+ <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="20"/>
+ <source>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers). The server will send a PIN to the email address provided that you will have to enter here.
-To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
+</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../mobile-widgets/qml/StartPage.qml" line="23"/>
+ <source>To use Subsurface-mobile only with local data on this device, tap on the no cloud icon below.</source>
<translation type="unfinished"/>
</message>
</context>
@@ -7631,7 +7783,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SubsurfaceWebServices</name>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="419"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="395"/>
+ <source>Enter User ID and click Download</source>
+ <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="417"/>
<source>Webservice</source>
<translation>Вебсервис</translation>
</message>
@@ -7656,30 +7813,25 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Ошибка соединения:</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
- <source>Download successful</source>
- <translation>Загрузка завершена</translation>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/>
<source>Invalid user identifier!</source>
<translation>Неверный идентификатор пользователя!</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="397"/>
- <source>Enter User ID and click Download</source>
- <translation>Укажите КЛЮЧ и нажмите Загрузить</translation>
- </message>
- <message>
<location filename="../desktop-widgets/subsurfacewebservices.cpp" line="554"/>
<source>Cannot parse response!</source>
<translation>Невозможно разобрать ответ!</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="557"/>
+ <source>Download successful</source>
+ <translation>Загрузка завершена</translation>
+ </message>
</context>
<context>
<name>SuitFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="674"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="672"/>
<source>Suits: </source>
<translation>Костюмы:</translation>
</message>
@@ -7687,7 +7839,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>SuitsFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="123"/>
+ <location filename="../qt-models/filtermodels.cpp" line="128"/>
<source>No suit set</source>
<translation>Костюм не указан</translation>
</message>
@@ -7706,7 +7858,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="593"/>
<source>Tags: </source>
<translation>Метки:</translation>
</message>
@@ -7714,7 +7866,7 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TagFilterModel</name>
<message>
- <location filename="../qt-models/filtermodels.cpp" line="148"/>
+ <location filename="../qt-models/filtermodels.cpp" line="153"/>
<source>Empty tags</source>
<translation>Без меток</translation>
</message>
@@ -7740,6 +7892,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TemplateEdit</name>
<message>
+ <location filename="../desktop-widgets/templateedit.ui" line="14"/>
+ <source>Edit template</source>
+ <translation>Редактирование шаблона</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/templateedit.ui" line="37"/>
<source>Preview</source>
<translation>Просмотр</translation>
@@ -7785,11 +7942,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Размер шрифта</translation>
</message>
<message>
- <location filename="../desktop-widgets/templateedit.ui" line="14"/>
- <source>Edit template</source>
- <translation>Редактирование шаблона</translation>
- </message>
- <message>
<location filename="../desktop-widgets/templateedit.ui" line="165"/>
<source>Color palette</source>
<translation>Палитра цветов</translation>
@@ -7971,85 +8123,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TextHyperlinkEventFilter</name>
<message>
- <location filename="../desktop-widgets/simplewidgets.cpp" line="817"/>
+ <location filename="../desktop-widgets/simplewidgets.cpp" line="815"/>
<source>%1click to visit %2</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>ThemeTest</name>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="29"/>
- <source>Theme Information</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="33"/>
- <source>Screen</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="42"/>
- <source>Geometry (pixels):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="49"/>
- <source>Geometry (gridUnits):</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="56"/>
- <source>Units.gridUnit:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="63"/>
- <source>Units.devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="70"/>
- <source>Font Metrics</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="76"/>
- <source>FontMetrics pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="83"/>
- <source>FontMetrics pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="90"/>
- <source>FontMetrics devicePixelRatio:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="97"/>
- <source>Text item pixelSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="104"/>
- <source>Text item pointSize:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="111"/>
- <source>Pixel density:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../mobile-widgets/qml/ThemeTest.qml" line="118"/>
- <source>Height of default font:</source>
- <translation type="unfinished"/>
- </message>
-</context>
-<context>
<name>ToolTipItem</name>
<message>
<location filename="../profile-widget/divetooltipitem.cpp" line="136"/>
@@ -8060,102 +8139,107 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>TripItem</name>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="67"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="68"/>
<source>(%1 shown)</source>
<translation> (показано %1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="194"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="212"/>
<source>#</source>
<translation>№</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="197"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="215"/>
<source>Date</source>
<translation>Дата</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="200"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="218"/>
<source>Rating</source>
<translation>Оценка</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>Depth(%1)</source>
<translation>Глубина(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>m</source>
<translation>м</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="203"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="221"/>
<source>ft</source>
<translation>фут</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="206"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="224"/>
<source>Duration</source>
<translation>Длительность</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="209"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="227"/>
<source>Temp(%1%2)</source>
<translation>Температура(%1%2)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>Weight(%1)</source>
<translation>Вес(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>kg</source>
<translation>кг</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="212"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="230"/>
<source>lbs</source>
<translation>фунт</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="215"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="233"/>
<source>Suit</source>
<translation>Костюм</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="218"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="236"/>
<source>Cyl</source>
<translation>Баллон</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="221"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="239"/>
<source>Gas</source>
<translation>Смесь</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>SAC(%1)</source>
<translation>SAC(%1)</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="226"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="244"/>
<source>/min</source>
<translation>/мин</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="229"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="247"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="232"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="250"/>
<source>Max CNS</source>
<translation>Макс. CNS</translation>
</message>
<message>
- <location filename="../qt-models/divetripmodel.cpp" line="235"/>
+ <location filename="../qt-models/divetripmodel.cpp" line="253"/>
+ <source>Photos before/during/after dive</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../qt-models/divetripmodel.cpp" line="256"/>
<source>Location</source>
<translation>Местонахождение</translation>
</message>
@@ -8178,72 +8262,73 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UpdateManager</name>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="69"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="61"/>
<source>Check for updates.</source>
<translation>Проверить обновления.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="70"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="62"/>
<source>Subsurface was unable to check for updates.</source>
<translation>Не получилось проверить наличие обновлений.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="75"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="67"/>
<source>The following error occurred:</source>
<translation>Возникла ошибка:</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="76"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="68"/>
<source>Please check your internet connection.</source>
<translation>Проверьте Интернет-соединение.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="86"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="78"/>
<source>You are using the latest version of Subsurface.</source>
<translation>Вы используете актуальную версию Subsurface.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="89"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="81"/>
<source>A new version of Subsurface is available.&lt;br/&gt;Click on:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt; to download it.</source>
<translation>Доступна новая верся Subsurface.&lt;br/&gt;Кликинте по:&lt;br/&gt;&lt;a href=&quot;%1&quot;&gt;%1&lt;/a&gt;&lt;br/&gt;, чтобы скачать.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="95"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="87"/>
<source>A new version of Subsurface is available.</source>
<translation>Доступна новая версия Subsurface.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="96"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="88"/>
<source>Latest version is %1, please check %2 our download page %3 for information in how to update.</source>
<translation>Последняя версия %1, передите на %2 нашу страницу загрузки %3 чтобы узнать как обновиться.</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="106"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="98"/>
<source>Newest release version is </source>
<translation>Последняя версия</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="107"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="99"/>
<source>The server returned the following information:</source>
<translation>Сервер вернул следующую информацию:</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="125"/>
- <source>Subsurface is checking every two weeks if a new version is available. If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
- <translation>Subsurface проверяет наличие новых версий каждые две недели. Если вы не желаете выполнять эти проверки, нажмите Отказаться.</translation>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="117"/>
+ <source>Subsurface is checking every two weeks if a new version is available.
+ If you don&apos;t want Subsurface to continue checking, please click Decline.</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="126"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="119"/>
<source>Decline</source>
<translation>Отказаться</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="127"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="120"/>
<source>Accept</source>
<translation>Принять</translation>
</message>
<message>
- <location filename="../desktop-widgets/updatemanager.cpp" line="129"/>
+ <location filename="../desktop-widgets/updatemanager.cpp" line="122"/>
<source>Automatic check for updates</source>
<translation>Автоматическая проверка обновлений</translation>
</message>
@@ -8265,24 +8350,6 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<context>
<name>UserSurvey</name>
<message>
- <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
- <location filename="../build/ui_usersurvey.h" line="151"/>
- <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
- <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мы хотели бы узнать наших пользователей и их предпочтения. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
- <location filename="../build/ui_usersurvey.h" line="156"/>
- <source>Other software/sources</source>
- <translation>Другие программы/источники</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
- <location filename="../build/ui_usersurvey.h" line="157"/>
- <source>Manually entering dives</source>
- <translation>Ручной ввод погружений</translation>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.ui" line="14"/>
<location filename="../build/ui_usersurvey.h" line="149"/>
<source>User survey</source>
@@ -8295,6 +8362,12 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Анкета Subsurface</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="44"/>
+ <location filename="../build/ui_usersurvey.h" line="151"/>
+ <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;We would love to learn more about our users, their preferences and their usage habits. Please spare a minute to fill out this form and submit it to the Subsurface team.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+ <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Мы хотели бы узнать наших пользователей и их предпочтения. Пожалуйста, потратьте минуту, чтобы заполнить эту форму и отправить ее команде Subsurface.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="63"/>
<location filename="../build/ui_usersurvey.h" line="152"/>
<source>Technical diver</source>
@@ -8319,6 +8392,18 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Из дайвкомпьютера</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="115"/>
+ <location filename="../build/ui_usersurvey.h" line="156"/>
+ <source>Other software/sources</source>
+ <translation>Другие программы/источники</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/usersurvey.ui" line="128"/>
+ <location filename="../build/ui_usersurvey.h" line="157"/>
+ <source>Manually entering dives</source>
+ <translation>Ручной ввод погружений</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.ui" line="141"/>
<location filename="../build/ui_usersurvey.h" line="158"/>
<source>Android/iPhone companion app</source>
@@ -8349,6 +8434,11 @@ To use Subsurface-mobile only with local data on this device, tap on the no clou
<translation>Откуда вы загружаете данные?</translation>
</message>
<message>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
+ <source>Send</source>
+ <translation>Отправить</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="43"/>
<source>
Operating system: %1</source>
@@ -8392,19 +8482,14 @@ Language: %1</source>
<translation>Спросить позже</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
- <source>Submit user survey.</source>
- <translation>Отправить опросник.</translation>
- </message>
- <message>
<location filename="../desktop-widgets/usersurvey.cpp" line="82"/>
<source>Ask again?</source>
<translation>Спрашивать снова?</translation>
</message>
<message>
- <location filename="../desktop-widgets/usersurvey.cpp" line="18"/>
- <source>Send</source>
- <translation>Отправить</translation>
+ <location filename="../desktop-widgets/usersurvey.cpp" line="101"/>
+ <source>Submit user survey.</source>
+ <translation>Отправить опросник.</translation>
</message>
<message>
<location filename="../desktop-widgets/usersurvey.cpp" line="102"/>
@@ -8496,12 +8581,12 @@ Language: %1</source>
<translation>Выгрузить</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="324"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="325"/>
<source>Operation timed out</source>
<translation>Таймаут выполнения</translation>
</message>
<message>
- <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="345"/>
+ <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="346"/>
<source>Transferring data...</source>
<translation>Передача данных...</translation>
</message>
@@ -8536,18 +8621,18 @@ Language: %1</source>
<context>
<name>WriteSettingsThread</name>
<message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1702"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1709"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1718"/>
- <source>Failed!</source>
- <translation>Ошибка!</translation>
- </message>
- <message>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1700"/>
- <location filename="../core/configuredivecomputerthreads.cpp" line="1721"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1689"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1710"/>
<source>This feature is not yet available for the selected dive computer.</source>
<translation>Эта функция пока недоступна для выбранного дайвкомпьютера.</translation>
</message>
+ <message>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1691"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1698"/>
+ <location filename="../core/configuredivecomputerthreads.cpp" line="1707"/>
+ <source>Failed!</source>
+ <translation>Ошибка!</translation>
+ </message>
</context>
<context>
<name>YearlyStatisticsModel</name>
@@ -8672,7 +8757,7 @@ Maximum</source>
<context>
<name>getextFromC</name>
<message>
- <location filename="../core/libdivecomputer.c" line="674"/>
+ <location filename="../core/libdivecomputer.c" line="737"/>
<source>Error parsing the header</source>
<translation>Ошибка разбора заголовка</translation>
</message>
@@ -8680,38 +8765,377 @@ Maximum</source>
<context>
<name>gettextFromC</name>
<message>
+ <location filename="../core/cochran.c" line="309"/>
+ <location filename="../core/cochran.c" line="315"/>
+ <location filename="../core/cochran.c" line="385"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>deco stop</source>
+ <translation>деко стоп</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="336"/>
+ <location filename="../core/cochran.c" line="390"/>
+ <location filename="../core/file.c" line="777"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ascent</source>
+ <translation>подъем</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="342"/>
+ <location filename="../core/file.c" line="755"/>
+ <source>battery</source>
+ <translation>батарея</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="348"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>OLF</source>
+ <translation>OLF</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="353"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>maxdepth</source>
+ <translation>макс. глуб.</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="358"/>
+ <location filename="../core/cochran.c" line="404"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
+ <source>pO₂</source>
+ <translation>pO₂</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="365"/>
+ <location filename="../core/cochran.c" line="414"/>
+ <location filename="../core/cochran.c" line="421"/>
+ <location filename="../core/file.c" line="868"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
+ <source>gaschange</source>
+ <translation>замена смеси</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="370"/>
+ <location filename="../core/cochran.c" line="409"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>rbt</source>
+ <translation>оставшееся время на дне</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="379"/>
+ <location filename="../core/cochran.c" line="426"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>ceiling</source>
+ <translation>потолок</translation>
+ </message>
+ <message>
+ <location filename="../core/cochran.c" line="395"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
+ <source>transmitter</source>
+ <translation>передатчик</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="153"/>
+ <source>Error: the file does not appear to be a DATATRAK divelog</source>
+ <translation>Ошибка: файл не является журналом DATATRAK.</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="286"/>
+ <source>clear</source>
+ <translation>ясно</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="289"/>
+ <source>misty</source>
+ <translation>туман</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="292"/>
+ <source>fog</source>
+ <translation>туман</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="295"/>
+ <source>rain</source>
+ <translation>дождь</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="298"/>
+ <source>storm</source>
+ <translation>шторм</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="301"/>
+ <source>snow</source>
+ <translation>снег</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="321"/>
+ <source>No suit</source>
+ <translation>Без костюма</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="324"/>
+ <source>Shorty</source>
+ <translation>Шорты</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="327"/>
+ <source>Combi</source>
+ <translation>Комбинезон</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="330"/>
+ <source>Wet suit</source>
+ <translation>Мокрый костюм</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="333"/>
+ <source>Semidry suit</source>
+ <translation>Полусухой костюм</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="336"/>
+ <source>Dry suit</source>
+ <translation>Сухой костюм</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="396"/>
+ <source>no stop</source>
+ <translation>без остановки</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="398"/>
+ <location filename="../core/dive.c" line="29"/>
+ <source>deco</source>
+ <translation>деко стоп</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="400"/>
+ <source>single ascent</source>
+ <translation>единичный подъем</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="402"/>
+ <source>multiple ascent</source>
+ <translation>множественный подъем</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="404"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>fresh</source>
+ <translation>пресная</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="406"/>
+ <source>salt water</source>
+ <translation>соленая вода</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="431"/>
+ <source>sight seeing</source>
+ <translation>обзорная прогулка</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="433"/>
+ <source>club dive</source>
+ <translation>погружение с клубом</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="435"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>instructor</source>
+ <translation>инструктор</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="437"/>
+ <source>instruction</source>
+ <translation>обучение</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="439"/>
+ <location filename="../core/dive.c" line="27"/>
+ <source>night</source>
+ <translation>ночное</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="441"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>cave</source>
+ <translation>пещера</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="443"/>
+ <location filename="../core/dive.c" line="24"/>
+ <source>ice</source>
+ <translation>подледное</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="445"/>
+ <source>search</source>
+ <translation>поиск</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="455"/>
+ <location filename="../core/dive.c" line="25"/>
+ <source>wreck</source>
+ <translation>рэк</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="457"/>
+ <location filename="../core/dive.c" line="26"/>
+ <source>river</source>
+ <translation>в реке</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="459"/>
+ <location filename="../core/dive.c" line="23"/>
+ <source>drift</source>
+ <translation>течение</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="461"/>
+ <location filename="../core/dive.c" line="28"/>
+ <source>photo</source>
+ <translation>фото</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="463"/>
+ <source>other</source>
+ <translation>прочее</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="474"/>
+ <source>Other activities</source>
+ <translation>Прочие активности</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="498"/>
+ <source>Datatrak/Wlog notes</source>
+ <translation>Datatrak/Wlog notes</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="537"/>
+ <source>Manually entered dive</source>
+ <translation>Вручную введенное погружение</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="588"/>
+ <source>Unknown</source>
+ <translation>Неизвестно</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="674"/>
+ <source>Error: couldn&apos;t open the file %s</source>
+ <translation>Ошибка: невозможно открыть файл %s</translation>
+ </message>
+ <message>
+ <location filename="../core/datatrak.c" line="687"/>
+ <source>Error: no dive</source>
+ <translation>Ошибка: погружение отсутствует</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>boat</source>
+ <translation>с лодки</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="23"/>
+ <source>shore</source>
+ <translation>с берега</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>deep</source>
+ <translation>глубокое</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="24"/>
+ <source>cavern</source>
+ <translation>каверна</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="25"/>
+ <source>altitude</source>
+ <translation>высокогорье</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>pool</source>
+ <translation>бассейн</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="26"/>
+ <source>lake</source>
+ <translation>в озере</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="27"/>
+ <source>student</source>
+ <translation>ученик</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="28"/>
+ <source>video</source>
+ <translation>видео</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>OC-gas</source>
+ <translation>Смесь ОЦ</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <source>diluent</source>
+ <translation>дилуент</translation>
+ </message>
+ <message>
+ <location filename="../core/dive.c" line="33"/>
+ <location filename="../core/equipment.c" line="88"/>
+ <location filename="../core/planner.c" line="1436"/>
+ <location filename="../core/planner.c" line="1439"/>
+ <source>oxygen</source>
+ <translation>кислород</translation>
+ </message>
+ <message>
<location filename="../core/dive.c" line="181"/>
<source>pascal</source>
<translation>Па</translation>
</message>
<message>
<location filename="../core/dive.c" line="186"/>
- <location filename="../core/qthelper.cpp" line="669"/>
+ <location filename="../core/qthelper.cpp" line="674"/>
<source>bar</source>
<translation>бар</translation>
</message>
<message>
<location filename="../core/dive.c" line="190"/>
- <location filename="../core/qthelper.cpp" line="672"/>
+ <location filename="../core/qthelper.cpp" line="677"/>
<source>psi</source>
<translation>psi</translation>
</message>
<message>
+ <location filename="../core/dive.c" line="227"/>
+ <source>ℓ</source>
+ <translation>л</translation>
+ </message>
+ <message>
<location filename="../core/dive.c" line="232"/>
<source>cuft</source>
<translation>куб. фут</translation>
</message>
<message>
<location filename="../core/dive.c" line="269"/>
- <location filename="../core/qthelper.cpp" line="590"/>
- <location filename="../core/qthelper.cpp" line="605"/>
+ <location filename="../core/qthelper.cpp" line="595"/>
+ <location filename="../core/qthelper.cpp" line="610"/>
<source>m</source>
<translation>м</translation>
</message>
<message>
<location filename="../core/dive.c" line="274"/>
- <location filename="../core/qthelper.cpp" line="593"/>
- <location filename="../core/qthelper.cpp" line="607"/>
+ <location filename="../core/qthelper.cpp" line="598"/>
+ <location filename="../core/qthelper.cpp" line="612"/>
<source>ft</source>
<translation>фут</translation>
</message>
@@ -8737,53 +9161,58 @@ Maximum</source>
</message>
<message>
<location filename="../core/dive.c" line="325"/>
- <location filename="../core/qthelper.cpp" line="616"/>
- <location filename="../core/qthelper.cpp" line="626"/>
+ <location filename="../core/qthelper.cpp" line="621"/>
+ <location filename="../core/qthelper.cpp" line="631"/>
<source>lbs</source>
<translation>фунт</translation>
</message>
<message>
<location filename="../core/dive.c" line="329"/>
- <location filename="../core/qthelper.cpp" line="614"/>
- <location filename="../core/qthelper.cpp" line="624"/>
+ <location filename="../core/qthelper.cpp" line="619"/>
+ <location filename="../core/qthelper.cpp" line="629"/>
<source>kg</source>
<translation>кг</translation>
</message>
<message>
- <location filename="../core/dive.c" line="1772"/>
+ <location filename="../core/dive.c" line="1751"/>
<source>(%s) or (%s)</source>
<translation>(%s) или (%s)</translation>
</message>
<message>
- <location filename="../core/divelist.c" line="484"/>
+ <location filename="../core/divelist.c" line="487"/>
<location filename="../core/equipment.c" line="84"/>
- <location filename="../core/planner.c" line="1411"/>
- <location filename="../core/planner.c" line="1414"/>
+ <location filename="../core/planner.c" line="1432"/>
+ <location filename="../core/planner.c" line="1435"/>
<source>air</source>
<translation>воздух</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="197"/>
+ <location filename="../core/equipment.c" line="86"/>
+ <source>EAN%d</source>
+ <translation>EAN%d</translation>
+ </message>
+ <message>
+ <location filename="../core/equipment.c" line="198"/>
<source>integrated</source>
<translation>интегрированный</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="198"/>
+ <location filename="../core/equipment.c" line="199"/>
<source>belt</source>
<translation>пояс</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="199"/>
+ <location filename="../core/equipment.c" line="200"/>
<source>ankle</source>
<translation>груз на ноги</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="200"/>
+ <location filename="../core/equipment.c" line="201"/>
<source>backplate weight</source>
<translation>груз на пластину</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="201"/>
+ <location filename="../core/equipment.c" line="202"/>
<source>clip-on</source>
<translation>карабины</translation>
</message>
@@ -8796,8 +9225,8 @@ Maximum</source>
<location filename="../core/file.c" line="121"/>
<location filename="../core/file.c" line="512"/>
<location filename="../core/file.c" line="597"/>
- <location filename="../core/file.c" line="924"/>
- <location filename="../core/file.c" line="1056"/>
+ <location filename="../core/file.c" line="909"/>
+ <location filename="../core/file.c" line="1092"/>
<location filename="../core/ostctools.c" line="80"/>
<source>Failed to read &apos;%s&apos;</source>
<translation>Ошибка чтения &apos;%s&apos;</translation>
@@ -8855,486 +9284,496 @@ Maximum</source>
<translation>Калибровка O₂</translation>
</message>
<message>
- <location filename="../core/file.c" line="887"/>
- <source>No matching DC found for file &apos;%s&apos;</source>
- <translation>Не найден соответствующий компьютер для файла &apos;%s&apos;</translation>
+ <location filename="../core/git-access.c" line="134"/>
+ <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
+ <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>none</source>
- <translation>отсутствует</translation>
+ <location filename="../core/git-access.c" line="157"/>
+ <location filename="../core/git-access.c" line="177"/>
+ <source>Could not update local cache to newer remote data</source>
+ <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="309"/>
- <location filename="../core/cochran.c" line="315"/>
- <location filename="../core/cochran.c" line="385"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>deco stop</source>
- <translation>деко стоп</translation>
+ <location filename="../core/git-access.c" line="170"/>
+ <source>Subsurface cloud storage corrupted</source>
+ <translation>Облачное хранилице поверждено</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="342"/>
- <location filename="../core/file.c" line="755"/>
- <source>battery</source>
- <translation>батарея</translation>
+ <location filename="../core/git-access.c" line="284"/>
+ <source>Could not update Subsurface cloud storage, try again later</source>
+ <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="370"/>
- <location filename="../core/cochran.c" line="409"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>rbt</source>
- <translation>оставшееся время на дне</translation>
+ <location filename="../core/git-access.c" line="344"/>
+ <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
+ <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="336"/>
- <location filename="../core/cochran.c" line="390"/>
- <location filename="../core/file.c" line="777"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ascent</source>
- <translation>подъем</translation>
+ <location filename="../core/git-access.c" line="374"/>
+ <source>Remote storage and local data diverged. Cannot combine local and remote changes</source>
+ <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="379"/>
- <location filename="../core/cochran.c" line="426"/>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>ceiling</source>
- <translation>потолок</translation>
+ <location filename="../core/git-access.c" line="408"/>
+ <source>Remote storage and local data diverged</source>
+ <translation>Данные в локальном и облачном хранилице отличаются</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="202"/>
- <source>workload</source>
- <translation>нагрузка</translation>
+ <location filename="../core/git-access.c" line="411"/>
+ <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source>
+ <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="395"/>
- <location filename="../core/libdivecomputer.c" line="203"/>
- <source>transmitter</source>
- <translation>передатчик</translation>
+ <location filename="../core/git-access.c" line="420"/>
+ <source>Problems with local cache of Subsurface cloud data</source>
+ <translation>Проблема с локальным кэшем облачного хранилища</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="421"/>
+ <source>Moved cache data to %s. Please try the operation again.</source>
+ <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="743"/>
+ <source>Error connecting to Subsurface cloud storage</source>
+ <translation>Ошибка подключения к облачному хранилищу Subsurface</translation>
+ </message>
+ <message>
+ <location filename="../core/git-access.c" line="746"/>
+ <source>git clone of %s failed (%s)</source>
+ <translation>Клонирование git-репозитория %s не удалось (%s)</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="210"/>
+ <location filename="../core/parse-xml.c" line="3317"/>
+ <location filename="../core/uemis-downloader.c" line="134"/>
+ <source>unknown</source>
+ <translation>неизвестно</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>none</source>
+ <translation>отсутствует</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="223"/>
+ <source>workload</source>
+ <translation>нагрузка</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>violation</source>
<translation>нарушение</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>bookmark</source>
<translation>закладка</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>surface</source>
<translation>поверхность</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="203"/>
+ <location filename="../core/libdivecomputer.c" line="224"/>
<source>safety stop</source>
<translation>остановка безопасности</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="365"/>
- <location filename="../core/cochran.c" line="414"/>
- <location filename="../core/cochran.c" line="421"/>
- <location filename="../core/file.c" line="868"/>
- <location filename="../core/libdivecomputer.c" line="204"/>
- <location filename="../core/libdivecomputer.c" line="207"/>
- <source>gaschange</source>
- <translation>замена смеси</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (voluntary)</source>
<translation>остановка безопасности (добровольно)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="204"/>
+ <location filename="../core/libdivecomputer.c" line="225"/>
<source>safety stop (mandatory)</source>
<translation>остановка безопасности (обязательно)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>deepstop</source>
<translation>глубокая остановка</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>ceiling (safety stop)</source>
<translation>потолок (остановка безопасности)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="205"/>
- <source>divetime</source>
- <translation>время погружения</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="205"/>
+ <location filename="../core/libdivecomputer.c" line="226"/>
<source>below floor</source>
<comment>event showing dive is below deco floor and adding deco time</comment>
<translation>ниже пола</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="353"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>maxdepth</source>
- <translation>макс. глуб.</translation>
- </message>
- <message>
- <location filename="../core/cochran.c" line="348"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>OLF</source>
- <translation>OLF</translation>
+ <location filename="../core/libdivecomputer.c" line="226"/>
+ <source>divetime</source>
+ <translation>время погружения</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>airtime</source>
<translation>оставшееся время по воздуху</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>rgbm</source>
<translation>rgbm</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="206"/>
+ <location filename="../core/libdivecomputer.c" line="227"/>
<source>heading</source>
<translation>направление</translation>
</message>
<message>
- <location filename="../core/cochran.c" line="358"/>
- <location filename="../core/cochran.c" line="404"/>
- <location filename="../core/libdivecomputer.c" line="206"/>
- <source>pO₂</source>
- <translation>pO₂</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>tissue level warning</source>
<translation>насыщение тканей</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="207"/>
+ <location filename="../core/libdivecomputer.c" line="228"/>
<source>non stop time</source>
<translation>время без остановки</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="224"/>
+ <location filename="../core/libdivecomputer.c" line="237"/>
<source>invalid event number</source>
<translation>неверный номер события</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="658"/>
- <source>Unable to create parser for %s %s</source>
- <translation>Невозможно создать анализатор для %s %s</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="664"/>
- <source>Error registering the data</source>
- <translation>Ошибка регистрации данных</translation>
- </message>
- <message>
- <location filename="../core/libdivecomputer.c" line="495"/>
+ <location filename="../core/libdivecomputer.c" line="553"/>
<source>Error parsing the datetime</source>
<translation>Ошибка разбора даты/времени</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="513"/>
+ <location filename="../core/libdivecomputer.c" line="571"/>
<source>Dive %d: %s</source>
<translation>Погр. №%d - %s</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="519"/>
+ <location filename="../core/libdivecomputer.c" line="577"/>
<source>Error parsing the divetime</source>
<translation>Ошибка разбора времени погружения</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="529"/>
+ <location filename="../core/libdivecomputer.c" line="587"/>
<source>Error parsing the maxdepth</source>
<translation>Ошибка разбора макс. глубины</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="548"/>
+ <location filename="../core/libdivecomputer.c" line="606"/>
<source>Error parsing temperature</source>
<translation>Ошибка разбора температуры</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="568"/>
+ <location filename="../core/libdivecomputer.c" line="626"/>
<source>Error parsing the gas mix count</source>
<translation>Ошибка разбора счетчика смесей</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="580"/>
+ <location filename="../core/libdivecomputer.c" line="638"/>
<source>Error obtaining water salinity</source>
<translation>Ошибка получения солености воды</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="589"/>
+ <location filename="../core/libdivecomputer.c" line="647"/>
<source>Error obtaining surface pressure</source>
<translation>Ошибка получения давления на поверхности</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="614"/>
+ <location filename="../core/libdivecomputer.c" line="672"/>
<source>Error obtaining divemode</source>
<translation>Ошибка при получении режима погружения</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="634"/>
+ <location filename="../core/libdivecomputer.c" line="692"/>
<source>Error parsing the gas mix</source>
<translation>Ошибка разбора смеси</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="684"/>
+ <location filename="../core/libdivecomputer.c" line="717"/>
+ <source>Unable to create parser for %s %s</source>
+ <translation>Невозможно создать анализатор для %s %s</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="723"/>
+ <source>Error registering the data</source>
+ <translation>Ошибка регистрации данных</translation>
+ </message>
+ <message>
+ <location filename="../core/libdivecomputer.c" line="744"/>
<source>Error parsing the samples</source>
<translation>Ошибка разбора выборки</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="822"/>
+ <location filename="../core/libdivecomputer.c" line="882"/>
<source>Event: waiting for user action</source>
<translation>Событие: ожидание действия пользователя</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="830"/>
+ <location filename="../core/libdivecomputer.c" line="890"/>
<source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source>
<translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="894"/>
+ <location filename="../core/libdivecomputer.c" line="954"/>
<source>Error registering the event handler.</source>
<translation>Ошибка регистрации обработчика событий.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="899"/>
+ <location filename="../core/libdivecomputer.c" line="959"/>
<source>Error registering the cancellation handler.</source>
<translation>Ошибка регистрации обработчика завершения.</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="920"/>
+ <location filename="../core/libdivecomputer.c" line="980"/>
<source>Dive data import error</source>
<translation>Ошибка импорта данных погружения</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="959"/>
+ <location filename="../core/libdivecomputer.c" line="1019"/>
<source>Unable to create libdivecomputer context</source>
<translation>Невозможно создать контекст libdivecomputer</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="966"/>
+ <location filename="../core/libdivecomputer.c" line="1026"/>
<source>Unable to open %s %s (%s)</source>
<translation>Невозможно открыть %s %s (%s)</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="992"/>
+ <location filename="../core/libdivecomputer.c" line="1048"/>
<source>Insufficient privileges to open the device %s %s (%s)</source>
<translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="517"/>
- <source>Strange percentage reading %s
+ <location filename="../core/load-git.c" line="194"/>
+ <location filename="../core/parse-xml.c" line="1242"/>
+ <source>multiple GPS locations for this dive site; also %s
</source>
- <translation>Странное значение процентов %s
+ <translation>множественные GPS координаты для дайв-сайта, также %s
</translation>
</message>
<message>
- <location filename="../core/load-git.c" line="194"/>
- <location filename="../core/parse-xml.c" line="1238"/>
- <source>multiple GPS locations for this dive site; also %s
+ <location filename="../core/load-git.c" line="222"/>
+ <location filename="../core/parse-xml.c" line="1304"/>
+ <source>additional name for site: %s
</source>
- <translation>множественные GPS координаты для дайв-сайта, также %s
+ <translation>другое название дайв-сайта: %s
</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="2044"/>
+ <location filename="../core/ostctools.c" line="120"/>
+ <location filename="../core/ostctools.c" line="152"/>
+ <source>Unknown DC in dive %d</source>
+ <translation>Неизвестный дайв-компьютер в погружении %d</translation>
+ </message>
+ <message>
+ <location filename="../core/ostctools.c" line="165"/>
+ <source>Error - %s - parsing dive %d</source>
+ <translation>Ошибка %s в погружении %d</translation>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="517"/>
+ <source>Strange percentage reading %s
+</source>
+ <translation>Странное значение процентов %s
+</translation>
+ </message>
+ <message>
+ <location filename="../core/parse-xml.c" line="2051"/>
<source>Failed to parse &apos;%s&apos;</source>
<translation>Ошибка разбора &apos;%s&apos;</translation>
</message>
<message>
- <location filename="../core/parse-xml.c" line="3741"/>
+ <location filename="../core/parse-xml.c" line="3774"/>
<source>Can&apos;t open stylesheet %s</source>
<translation>Невозможно открыть файл преобразования %s</translation>
</message>
<message>
- <location filename="../core/equipment.c" line="86"/>
- <source>EAN%d</source>
- <translation>EAN%d</translation>
+ <location filename="../core/planner.c" line="555"/>
+ <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
+ <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
</message>
<message>
- <location filename="../core/planner.c" line="1032"/>
- <location filename="../core/planner.c" line="1184"/>
- <source>Can&apos;t find gas %s</source>
- <translation>Невозможно найти газ %s</translation>
+ <location filename="../core/planner.c" line="569"/>
+ <source>Decompression calculation aborted due to excessive time</source>
+ <translation>Расчет деко прекращен из-за большой длительности</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="571"/>
+ <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="834"/>
+ <location filename="../core/planner.c" line="860"/>
+ <location filename="../core/planner.c" line="870"/>
+ <source>Warning:</source>
+ <translation>Внимание:</translation>
</message>
<message>
- <location filename="../core/planner.c" line="368"/>
- <source>Too many gas mixes</source>
- <translation>Слишком много смесей</translation>
+ <location filename="../core/planner.c" line="581"/>
+ <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="568"/>
- <source>Decompression calculation aborted due to excessive time</source>
- <translation>Расчет деко прекращен из-за большой длительности</translation>
+ <location filename="../core/planner.c" line="586"/>
+ <source>based on VPM-B at nominal conservatism</source>
+ <translation>на основе VPM-B с номинальным консерватизмом</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="588"/>
+ <source>based on VPM-B at +%d conservatism</source>
+ <translation>на основе VPM-B с консерватизмом +%d</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="590"/>
+ <source>, effective GF=%d/%d</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="594"/>
+ <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
+ <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
</message>
<message>
- <location filename="../core/planner.c" line="592"/>
+ <location filename="../core/planner.c" line="598"/>
<source>Subsurface dive plan</source>
<translation>План погружения Subsurface</translation>
</message>
<message>
- <location filename="../core/planner.c" line="596"/>
- <source>depth</source>
- <translation>глубина</translation>
+ <location filename="../core/planner.c" line="599"/>
+ <source>&lt;div&gt;Runtime: %dmin&lt;/div&gt;&lt;br&gt;</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../core/planner.c" line="602"/>
- <source>runtime</source>
- <translation>отсчет</translation>
+ <location filename="../core/planner.c" line="604"/>
+ <source>depth</source>
+ <translation>глубина</translation>
</message>
<message>
- <location filename="../core/planner.c" line="599"/>
+ <location filename="../core/planner.c" line="607"/>
<source>duration</source>
<translation>длительность</translation>
</message>
<message>
- <location filename="../core/planner.c" line="554"/>
- <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source>
- <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation>
+ <location filename="../core/planner.c" line="610"/>
+ <source>runtime</source>
+ <translation>отсчет</translation>
</message>
<message>
- <location filename="../core/planner.c" line="605"/>
+ <location filename="../core/planner.c" line="613"/>
<source>gas</source>
<translation>смесь</translation>
</message>
<message>
- <location filename="../core/planner.c" line="648"/>
+ <location filename="../core/planner.c" line="656"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="656"/>
+ <location filename="../core/planner.c" line="664"/>
<source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source>
<translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="669"/>
+ <location filename="../core/planner.c" line="677"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source>
<translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="676"/>
+ <location filename="../core/planner.c" line="684"/>
<source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source>
<translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="721"/>
+ <location filename="../core/planner.c" line="729"/>
<source>%3.0f%s</source>
<translation>%3.0f%s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="724"/>
- <location filename="../core/planner.c" line="728"/>
+ <location filename="../core/planner.c" line="732"/>
+ <location filename="../core/planner.c" line="736"/>
<source>%3dmin</source>
<translation>%3dмин</translation>
</message>
<message>
- <location filename="../core/planner.c" line="737"/>
- <location filename="../core/planner.c" line="749"/>
+ <location filename="../core/planner.c" line="745"/>
+ <location filename="../core/planner.c" line="757"/>
<source>(SP = %.1fbar)</source>
<translation>(SP = %.1fбар)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="772"/>
+ <location filename="../core/planner.c" line="780"/>
<source>Switch gas to %s (SP = %.1fbar)</source>
<translation>Переключение на %s (SP = %.1fбар)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="774"/>
+ <location filename="../core/planner.c" line="782"/>
<source>Switch gas to %s</source>
<translation>Переключение на %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="793"/>
+ <location filename="../core/planner.c" line="801"/>
<source>CNS</source>
<translation>CNS</translation>
</message>
<message>
- <location filename="../core/planner.c" line="795"/>
+ <location filename="../core/planner.c" line="803"/>
<source>OTU</source>
<translation>OTU</translation>
</message>
<message>
- <location filename="../core/planner.c" line="799"/>
+ <location filename="../core/planner.c" line="807"/>
<source>Gas consumption (CCR legs excluded):</source>
<translation>Потребление газа (без CCR сегментов)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="801"/>
+ <location filename="../core/planner.c" line="809"/>
<source>Gas consumption:</source>
<translation>Расход газов:</translation>
</message>
<message>
- <location filename="../core/planner.c" line="570"/>
- <location filename="../core/planner.c" line="821"/>
- <location filename="../core/planner.c" line="826"/>
- <location filename="../core/planner.c" line="851"/>
- <location filename="../core/planner.c" line="861"/>
- <source>Warning:</source>
- <translation>Внимание:</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="580"/>
- <source>based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation>на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="584"/>
- <source>based on VPM-B at nominal conservatism</source>
- <translation>на основе VPM-B с номинальным консерватизмом</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="586"/>
- <source>based on VPM-B at +%d conservatism</source>
- <translation>на основе VPM-B с консерватизмом +%d</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="588"/>
- <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source>
- <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation>
- </message>
- <message>
- <location filename="../core/planner.c" line="822"/>
+ <location filename="../core/planner.c" line="830"/>
<source>this is more gas than available in the specified cylinder!</source>
<translation>расход выше чем запас газа в указанном баллоне!</translation>
</message>
<message>
- <location filename="../core/planner.c" line="827"/>
+ <location filename="../core/planner.c" line="835"/>
<source>not enough reserve for gas sharing on ascent!</source>
<translation>недостаточно газа для резерва при подъеме</translation>
</message>
<message>
- <location filename="../core/planner.c" line="829"/>
+ <location filename="../core/planner.c" line="837"/>
<source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source>
<translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation>
</message>
<message>
- <location filename="../core/planner.c" line="831"/>
+ <location filename="../core/planner.c" line="839"/>
<source>%.0f%s (%.0f%s during planned ascent) of %s</source>
<translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="848"/>
+ <location filename="../core/planner.c" line="857"/>
<source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="858"/>
+ <location filename="../core/planner.c" line="867"/>
<source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source>
<translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation>
</message>
<message>
- <location filename="../core/planner.c" line="1419"/>
+ <location filename="../core/planner.c" line="1194"/>
+ <source>Can&apos;t find gas %s</source>
+ <translation>Невозможно найти газ %s</translation>
+ </message>
+ <message>
+ <location filename="../core/planner.c" line="1440"/>
<source>ean</source>
<translation>ean</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1280"/>
+ <location filename="../core/profile.c" line="1298"/>
<source>@: %d:%02d
D: %.1f%s
</source>
@@ -9343,70 +9782,70 @@ D: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1283"/>
+ <location filename="../core/profile.c" line="1301"/>
<source>P: %d%s
</source>
<translation>Д: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1287"/>
+ <location filename="../core/profile.c" line="1305"/>
<source>T: %.1f%s
</source>
<translation>Т: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1293"/>
+ <location filename="../core/profile.c" line="1311"/>
<source>V: %.1f%s
</source>
<translation>С: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1296"/>
+ <location filename="../core/profile.c" line="1314"/>
<source>SAC: %.*f%s/min
</source>
<translation>SAC: %.*f%s/мин
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1298"/>
+ <location filename="../core/profile.c" line="1316"/>
<source>CNS: %u%%
</source>
<translation>CNS: %u%%
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1300"/>
+ <location filename="../core/profile.c" line="1318"/>
<source>pO%s: %.2fbar
</source>
<translation>pO%s: %.2fбар
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1302"/>
+ <location filename="../core/profile.c" line="1320"/>
<source>pN%s: %.2fbar
</source>
<translation>pN%s: %.2fбар
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1304"/>
+ <location filename="../core/profile.c" line="1322"/>
<source>pHe: %.2fbar
</source>
<translation>pHe: %.2fбар
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1307"/>
+ <location filename="../core/profile.c" line="1325"/>
<source>MOD: %d%s
</source>
<translation>MOD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1314"/>
+ <location filename="../core/profile.c" line="1332"/>
<source>EAD: %d%s
EADD: %d%s
</source>
@@ -9415,7 +9854,7 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1318"/>
+ <location filename="../core/profile.c" line="1336"/>
<source>END: %d%s
EADD: %d%s
</source>
@@ -9424,174 +9863,179 @@ EADD: %d%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1331"/>
+ <location filename="../core/profile.c" line="1349"/>
<source>Safetystop: %umin @ %.0f%s
</source>
<translation>Ост. безопасности: %uмин @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1334"/>
+ <location filename="../core/profile.c" line="1352"/>
<source>Safetystop: unkn time @ %.0f%s
</source>
<translation>Ост. безопасности: неизв. время @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1339"/>
+ <location filename="../core/profile.c" line="1357"/>
<source>Deco: %umin @ %.0f%s
</source>
<translation>Деко: %uмин @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1342"/>
+ <location filename="../core/profile.c" line="1360"/>
<source>Deco: unkn time @ %.0f%s
</source>
<translation>Деко: неиз. время @ %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1346"/>
+ <location filename="../core/profile.c" line="1364"/>
<source>In deco
</source>
<translation>В деко
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1348"/>
+ <location filename="../core/profile.c" line="1366"/>
<source>NDL: %umin
</source>
<translation>NDL: %uмин
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1351"/>
+ <location filename="../core/profile.c" line="1369"/>
<source>TTS: %umin
</source>
<translation>TTS: %uмин
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1354"/>
+ <location filename="../core/profile.c" line="1372"/>
<source>Deco: %umin @ %.0f%s (calc)
</source>
<translation>Деко: %uмин @ %.0f%s (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1362"/>
+ <location filename="../core/profile.c" line="1380"/>
<source>In deco (calc)
</source>
<translation>В деко (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1365"/>
+ <location filename="../core/profile.c" line="1383"/>
<source>NDL: %umin (calc)
</source>
<translation>NDL: %uмин (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1367"/>
+ <location filename="../core/profile.c" line="1385"/>
<source>NDL: &gt;2h (calc)
</source>
<translation>NDL: &gt;2ч (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1371"/>
+ <location filename="../core/profile.c" line="1389"/>
<source>TTS: %umin (calc)
</source>
<translation>TTS: %uмин (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1373"/>
+ <location filename="../core/profile.c" line="1391"/>
<source>TTS: &gt;2h (calc)
</source>
<translation>TTS: &gt;2ч (вычисл.)
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1376"/>
+ <location filename="../core/profile.c" line="1394"/>
<source>RBT: %umin
</source>
<translation>RBT: %uмин
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1379"/>
+ <location filename="../core/profile.c" line="1397"/>
<source>Calculated ceiling %.0f%s
</source>
<translation>Расчетный потолок %.0f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1385"/>
+ <location filename="../core/profile.c" line="1403"/>
<source>Tissue %.0fmin: %.1f%s
</source>
<translation>Ткань %.0fмин: %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1391"/>
+ <location filename="../core/profile.c" line="1409"/>
<source>heartbeat: %d
</source>
<translation>пульс: %d
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1393"/>
+ <location filename="../core/profile.c" line="1411"/>
<source>bearing: %d
</source>
<translation>азимут: %d
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1396"/>
+ <location filename="../core/profile.c" line="1414"/>
<source>mean depth to here %.1f%s
</source>
<translation>средная глубина здесь %.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1491"/>
+ <location filename="../core/profile.c" line="1515"/>
<source>%sT: %d:%02d min</source>
<translation>%sT: %d:%02d min</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1495"/>
- <location filename="../core/profile.c" line="1499"/>
- <location filename="../core/profile.c" line="1503"/>
+ <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1523"/>
+ <location filename="../core/profile.c" line="1527"/>
<source>%s %sD:%.1f%s</source>
<translation>%s %sГ:%.1f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1507"/>
+ <location filename="../core/profile.c" line="1531"/>
<source>%s %sD:%.1f%s
</source>
<translation>%s %sГ:%.1f%s
</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1511"/>
+ <location filename="../core/profile.c" line="1535"/>
<source>%s%sV:%.2f%s</source>
<translation>%s%sС:%.2f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1515"/>
- <location filename="../core/profile.c" line="1519"/>
+ <location filename="../core/profile.c" line="1539"/>
+ <location filename="../core/profile.c" line="1543"/>
<source>%s %sV:%.2f%s</source>
<translation>%s %sС:%.2f%s</translation>
</message>
<message>
- <location filename="../core/profile.c" line="1526"/>
+ <location filename="../core/profile.c" line="1550"/>
<source>%s %sP:%d %s</source>
<translation>%s %sД:%d %s</translation>
</message>
<message>
+ <location filename="../core/profile.c" line="1575"/>
+ <source>%s SAC:%.*f %s</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
<location filename="../core/qthelper.cpp" line="67"/>
<source>%1km</source>
<translation>%1км</translation>
@@ -9612,446 +10056,460 @@ EADD: %d%s
<translation>%1ярд</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="635"/>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="226"/>
+ <source>N</source>
+ <translation>С</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="91"/>
+ <location filename="../core/qthelper.cpp" line="227"/>
+ <source>S</source>
+ <translation>Ю</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="228"/>
+ <source>E</source>
+ <translation>В</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="92"/>
+ <location filename="../core/qthelper.cpp" line="229"/>
+ <source>W</source>
+ <translation>З</translation>
+ </message>
+ <message>
+ <location filename="../core/qthelper.cpp" line="640"/>
<source>C</source>
<translation>C</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="638"/>
+ <location filename="../core/qthelper.cpp" line="643"/>
<source>F</source>
<translation>F</translation>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>boat</source>
- <translation>с лодки</translation>
+ <location filename="../core/save-html.c" line="469"/>
+ <location filename="../core/save-html.c" line="553"/>
+ <location filename="../core/worldmap-save.c" line="111"/>
+ <source>Can&apos;t open file %s</source>
+ <translation>Невозможно открыть файл %s</translation>
</message>
<message>
- <location filename="../core/dive.c" line="23"/>
- <source>shore</source>
- <translation>с берега</translation>
+ <location filename="../core/save-html.c" line="488"/>
+ <source>Number</source>
+ <translation>Номер</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="459"/>
- <location filename="../core/dive.c" line="23"/>
- <source>drift</source>
- <translation>течение</translation>
+ <location filename="../core/save-html.c" line="489"/>
+ <source>Date</source>
+ <translation>Дата</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>deep</source>
- <translation>глубокое</translation>
+ <location filename="../core/save-html.c" line="490"/>
+ <source>Time</source>
+ <translation>Время</translation>
</message>
<message>
- <location filename="../core/dive.c" line="24"/>
- <source>cavern</source>
- <translation>каверна</translation>
+ <location filename="../core/save-html.c" line="491"/>
+ <source>Location</source>
+ <translation>Местонахождение</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="443"/>
- <location filename="../core/dive.c" line="24"/>
- <source>ice</source>
- <translation>подледное</translation>
+ <location filename="../core/save-html.c" line="492"/>
+ <source>Air temp.</source>
+ <translation>Темп. воздуха</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="445"/>
- <source>search</source>
- <translation>поиск</translation>
+ <location filename="../core/save-html.c" line="493"/>
+ <source>Water temp.</source>
+ <translation>Темп. воды</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="455"/>
- <location filename="../core/dive.c" line="25"/>
- <source>wreck</source>
- <translation>рэк</translation>
+ <location filename="../core/save-html.c" line="494"/>
+ <source>Dives</source>
+ <translation>Погружения</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="441"/>
- <location filename="../core/dive.c" line="25"/>
- <source>cave</source>
- <translation>пещера</translation>
+ <location filename="../core/save-html.c" line="495"/>
+ <source>Expand all</source>
+ <translation>Развернуть все</translation>
</message>
<message>
- <location filename="../core/dive.c" line="25"/>
- <source>altitude</source>
- <translation>высокогорье</translation>
+ <location filename="../core/save-html.c" line="496"/>
+ <source>Collapse all</source>
+ <translation>Свернуть все</translation>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>pool</source>
- <translation>бассейн</translation>
+ <location filename="../core/save-html.c" line="497"/>
+ <source>Trips</source>
+ <translation>Поездки</translation>
</message>
<message>
- <location filename="../core/dive.c" line="26"/>
- <source>lake</source>
- <translation>в озере</translation>
+ <location filename="../core/save-html.c" line="498"/>
+ <source>Statistics</source>
+ <translation>Статистика</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="457"/>
- <location filename="../core/dive.c" line="26"/>
- <source>river</source>
- <translation>в реке</translation>
+ <location filename="../core/save-html.c" line="499"/>
+ <source>Advanced search</source>
+ <translation>Расширенный поиск</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="439"/>
- <location filename="../core/dive.c" line="27"/>
- <source>night</source>
- <translation>ночное</translation>
+ <location filename="../core/save-html.c" line="502"/>
+ <source>Rating</source>
+ <translation>Оценка</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="153"/>
- <source>Error: the file does not appear to be a DATATRAK divelog</source>
- <translation>Ошибка: файл не является журналом DATATRAK.</translation>
+ <location filename="../core/save-html.c" line="503"/>
+ <source>Visibility</source>
+ <translation>Видимость</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="286"/>
- <source>clear</source>
- <translation>ясно</translation>
+ <location filename="../core/save-html.c" line="504"/>
+ <source>Duration</source>
+ <translation>Длительность</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="289"/>
- <source>misty</source>
- <translation>туман</translation>
+ <location filename="../core/save-html.c" line="505"/>
+ <source>Divemaster</source>
+ <translation>Инструктор</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="292"/>
- <source>fog</source>
- <translation>туман</translation>
+ <location filename="../core/save-html.c" line="506"/>
+ <source>Buddy</source>
+ <translation>Партнер</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="295"/>
- <source>rain</source>
- <translation>дождь</translation>
+ <location filename="../core/save-html.c" line="507"/>
+ <source>Suit</source>
+ <translation>Костюм</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="298"/>
- <source>storm</source>
- <translation>шторм</translation>
+ <location filename="../core/save-html.c" line="508"/>
+ <source>Tags</source>
+ <translation>Метки</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="301"/>
- <source>snow</source>
- <translation>снег</translation>
+ <location filename="../core/save-html.c" line="509"/>
+ <location filename="../smtk-import/smartrak.c" line="251"/>
+ <location filename="../smtk-import/smartrak.c" line="321"/>
+ <source>Notes</source>
+ <translation>Примечания</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="321"/>
- <source>No suit</source>
- <translation>Без костюма</translation>
+ <location filename="../core/save-html.c" line="510"/>
+ <source>Show more details</source>
+ <translation>Подробнее</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="324"/>
- <source>Shorty</source>
- <translation>Шорты</translation>
+ <location filename="../core/save-html.c" line="513"/>
+ <source>Yearly statistics</source>
+ <translation>Статистика по годам</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="327"/>
- <source>Combi</source>
- <translation>Комбинезон</translation>
+ <location filename="../core/save-html.c" line="514"/>
+ <source>Year</source>
+ <translation>Год</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="330"/>
- <source>Wet suit</source>
- <translation>Мокрый костюм</translation>
+ <location filename="../core/save-html.c" line="515"/>
+ <source>Total time</source>
+ <translation>Общее время</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="333"/>
- <source>Semidry suit</source>
- <translation>Полусухой костюм</translation>
+ <location filename="../core/save-html.c" line="516"/>
+ <source>Average time</source>
+ <translation>Среднее время</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="336"/>
- <source>Dry suit</source>
- <translation>Сухой костюм</translation>
+ <location filename="../core/save-html.c" line="517"/>
+ <source>Shortest time</source>
+ <translation>Мин. время</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="396"/>
- <source>no stop</source>
- <translation>без остановки</translation>
+ <location filename="../core/save-html.c" line="518"/>
+ <source>Longest time</source>
+ <translation>Макс. время</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="400"/>
- <source>single ascent</source>
- <translation>единичный подъем</translation>
+ <location filename="../core/save-html.c" line="519"/>
+ <source>Average depth</source>
+ <translation>Сред. глуб.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="402"/>
- <source>multiple ascent</source>
- <translation>множественный подъем</translation>
+ <location filename="../core/save-html.c" line="520"/>
+ <source>Min. depth</source>
+ <translation>Мин. глуб.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="404"/>
- <location filename="../core/dive.c" line="27"/>
- <source>fresh</source>
- <translation>пресная</translation>
+ <location filename="../core/save-html.c" line="521"/>
+ <source>Max. depth</source>
+ <translation>Макс. глубина</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="406"/>
- <source>salt water</source>
- <translation>соленая вода</translation>
+ <location filename="../core/save-html.c" line="522"/>
+ <source>Average SAC</source>
+ <translation>Средний SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="431"/>
- <source>sight seeing</source>
- <translation>обзорная прогулка</translation>
+ <location filename="../core/save-html.c" line="523"/>
+ <source>Min. SAC</source>
+ <translation>Мин. SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="433"/>
- <source>club dive</source>
- <translation>погружение с клубом</translation>
+ <location filename="../core/save-html.c" line="524"/>
+ <source>Max. SAC</source>
+ <translation>Макс. SAC</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="437"/>
- <source>instruction</source>
- <translation>обучение</translation>
+ <location filename="../core/save-html.c" line="525"/>
+ <source>Average temp.</source>
+ <translation>Сред. темп.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="463"/>
- <source>other</source>
- <translation>прочее</translation>
+ <location filename="../core/save-html.c" line="526"/>
+ <source>Min. temp.</source>
+ <translation>Мин. темп.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="474"/>
- <source>Other activities</source>
- <translation>Прочие активности</translation>
+ <location filename="../core/save-html.c" line="527"/>
+ <source>Max. temp.</source>
+ <translation>Макс. темп.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="498"/>
- <source>Datatrak/Wlog notes</source>
- <translation>Datatrak/Wlog notes</translation>
+ <location filename="../core/save-html.c" line="528"/>
+ <source>Back to list</source>
+ <translation>Вернуться к списку</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="537"/>
- <source>Manually entered dive</source>
- <translation>Вручную введенное погружение</translation>
+ <location filename="../core/save-html.c" line="531"/>
+ <source>Dive No.</source>
+ <translation>Погружение № </translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="588"/>
- <source>Unknown</source>
- <translation>Неизвестно</translation>
+ <location filename="../core/save-html.c" line="532"/>
+ <source>Dive profile</source>
+ <translation>Профиль погружения</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="674"/>
- <source>Error: couldn&apos;t open the file %s</source>
- <translation>Ошибка: невозможно открыть файл %s</translation>
+ <location filename="../core/save-html.c" line="533"/>
+ <source>Dive information</source>
+ <translation>Информация о погружении</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="687"/>
- <source>Error: no dive</source>
- <translation>Ошибка: погружение отсутствует</translation>
+ <location filename="../core/save-html.c" line="534"/>
+ <source>Dive equipment</source>
+ <translation>Снаряжение</translation>
</message>
<message>
- <location filename="../core/dive.c" line="27"/>
- <source>student</source>
- <translation>ученик</translation>
+ <location filename="../core/save-html.c" line="535"/>
+ <location filename="../core/save-html.c" line="542"/>
+ <source>Type</source>
+ <translation>Тип</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="461"/>
- <location filename="../core/dive.c" line="28"/>
- <source>photo</source>
- <translation>фото</translation>
+ <location filename="../core/save-html.c" line="536"/>
+ <source>Size</source>
+ <translation>Объем</translation>
</message>
<message>
- <location filename="../core/dive.c" line="28"/>
- <source>video</source>
- <translation>видео</translation>
+ <location filename="../core/save-html.c" line="537"/>
+ <source>Work pressure</source>
+ <translation>Раб. давл.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="435"/>
- <location filename="../core/dive.c" line="28"/>
- <source>instructor</source>
- <translation>инструктор</translation>
+ <location filename="../core/save-html.c" line="538"/>
+ <source>Start pressure</source>
+ <translation>Нач. давл.</translation>
</message>
<message>
- <location filename="../core/datatrak.c" line="398"/>
- <location filename="../core/dive.c" line="29"/>
- <source>deco</source>
- <translation>деко стоп</translation>
+ <location filename="../core/save-html.c" line="539"/>
+ <source>End pressure</source>
+ <translation>Кон. давл.</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>OC-gas</source>
- <translation>Смесь ОЦ</translation>
+ <location filename="../core/save-html.c" line="540"/>
+ <source>Gas</source>
+ <translation>Смесь</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <source>diluent</source>
- <translation>дилуент</translation>
+ <location filename="../core/save-html.c" line="541"/>
+ <source>Weight</source>
+ <translation>Вес</translation>
</message>
<message>
- <location filename="../core/dive.c" line="33"/>
- <location filename="../core/equipment.c" line="88"/>
- <location filename="../core/planner.c" line="1415"/>
- <location filename="../core/planner.c" line="1418"/>
- <source>oxygen</source>
- <translation>кислород</translation>
+ <location filename="../core/save-html.c" line="543"/>
+ <source>Events</source>
+ <translation>События</translation>
</message>
<message>
- <location filename="../core/dive.c" line="227"/>
- <source>ℓ</source>
- <translation>л</translation>
+ <location filename="../core/save-html.c" line="544"/>
+ <source>Name</source>
+ <translation>Название</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="545"/>
+ <source>Value</source>
+ <translation>Значение</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="546"/>
+ <source>Coordinates</source>
+ <translation>Координаты</translation>
+ </message>
+ <message>
+ <location filename="../core/save-html.c" line="547"/>
+ <source>Dive status</source>
+ <translation>Статистика погружения</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="239"/>
+ <location filename="../core/statistics.c" line="242"/>
<source>more than %d days</source>
<translation>более %d дней</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="246"/>
+ <location filename="../core/statistics.c" line="249"/>
<source>%dd %dh %dmin</source>
<translation>%dд %dч %dмин</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="249"/>
+ <location filename="../core/statistics.c" line="252"/>
<source>%dmin %dsecs</source>
<translation>%dмин %dсек</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="251"/>
+ <location filename="../core/statistics.c" line="254"/>
<source>%dh %dmin</source>
<translation>%dч %dмин</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="263"/>
+ <location filename="../core/statistics.c" line="266"/>
<source>for dives #</source>
<translation>для погружений №</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="269"/>
+ <location filename="../core/statistics.c" line="272"/>
<source>for selected dives</source>
<translation>для выбранных погружений</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="304"/>
+ <location filename="../core/statistics.c" line="307"/>
<source>for dive #%d</source>
<translation>для погружения №%d</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="306"/>
+ <location filename="../core/statistics.c" line="309"/>
<source>for selected dive</source>
<translation>для выбранного погружения</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="308"/>
+ <location filename="../core/statistics.c" line="311"/>
<source>for all dives</source>
<translation>для всех погружений</translation>
</message>
<message>
- <location filename="../core/statistics.c" line="310"/>
+ <location filename="../core/statistics.c" line="313"/>
<source>(no dives)</source>
<translation>(нет погружений)</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sun</source>
<translation>Вск</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Mon</source>
<translation>Пнд</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Tue</source>
<translation>Втр</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Wed</source>
<translation>Срд</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Thu</source>
<translation>Чтв</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Fri</source>
<translation>Птн</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="120"/>
+ <location filename="../core/subsurfacestartup.c" line="125"/>
<source>Sat</source>
<translation>Суб</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jan</source>
<translation>Янв</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Feb</source>
<translation>Фев</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Mar</source>
<translation>Мар</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Apr</source>
<translation>Апр</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>May</source>
<translation>Май</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="129"/>
+ <location filename="../core/subsurfacestartup.c" line="134"/>
<source>Jun</source>
<translation>Июн</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Jul</source>
<translation>Июл</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Aug</source>
<translation>Авг</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Sep</source>
<translation>Снт</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Oct</source>
<translation>Окт</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Nov</source>
<translation>Ноя</translation>
</message>
<message>
- <location filename="../core/subsurfacestartup.c" line="130"/>
+ <location filename="../core/subsurfacestartup.c" line="135"/>
<source>Dec</source>
<translation>Дек</translation>
</message>
<message>
- <location filename="../core/libdivecomputer.c" line="191"/>
- <location filename="../core/parse-xml.c" line="3284"/>
- <location filename="../core/uemis-downloader.c" line="134"/>
- <source>unknown</source>
- <translation>неизвестно</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="467"/>
- <source>data</source>
- <translation>данные</translation>
- </message>
- <message>
- <location filename="../core/uemis-downloader.c" line="447"/>
- <source>%s %s</source>
- <translation>%s %s</translation>
- </message>
- <message>
<location filename="../core/uemis-downloader.c" line="27"/>
<source>Uemis Zurich: the file system is almost full.
Disconnect/reconnect the dive computer
@@ -10082,6 +10540,16 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Не погружений для загрузки.</translation>
</message>
<message>
+ <location filename="../core/uemis-downloader.c" line="447"/>
+ <source>%s %s</source>
+ <translation>%s %s</translation>
+ </message>
+ <message>
+ <location filename="../core/uemis-downloader.c" line="467"/>
+ <source>data</source>
+ <translation>данные</translation>
+ </message>
+ <message>
<location filename="../core/uemis-downloader.c" line="495"/>
<source>divelog #</source>
<translation>журнала №</translation>
@@ -10252,281 +10720,6 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Тревога: заряд батареи</translation>
</message>
<message>
- <location filename="../core/save-html.c" line="469"/>
- <location filename="../core/save-html.c" line="553"/>
- <location filename="../core/worldmap-save.c" line="111"/>
- <source>Can&apos;t open file %s</source>
- <translation>Невозможно открыть файл %s</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="488"/>
- <source>Number</source>
- <translation>Номер</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="489"/>
- <source>Date</source>
- <translation>Дата</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="490"/>
- <source>Time</source>
- <translation>Время</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="491"/>
- <source>Location</source>
- <translation>Местонахождение</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="492"/>
- <source>Air temp.</source>
- <translation>Темп. воздуха</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="493"/>
- <source>Water temp.</source>
- <translation>Темп. воды</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="498"/>
- <source>Statistics</source>
- <translation>Статистика</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="502"/>
- <source>Rating</source>
- <translation>Оценка</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="503"/>
- <source>Visibility</source>
- <translation>Видимость</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="504"/>
- <source>Duration</source>
- <translation>Длительность</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="494"/>
- <source>Dives</source>
- <translation>Погружения</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="495"/>
- <source>Expand all</source>
- <translation>Развернуть все</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="496"/>
- <source>Collapse all</source>
- <translation>Свернуть все</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="497"/>
- <source>Trips</source>
- <translation>Поездки</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="499"/>
- <source>Advanced search</source>
- <translation>Расширенный поиск</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="505"/>
- <source>Divemaster</source>
- <translation>Инструктор</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="506"/>
- <source>Buddy</source>
- <translation>Партнер</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="507"/>
- <source>Suit</source>
- <translation>Костюм</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="508"/>
- <source>Tags</source>
- <translation>Метки</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="509"/>
- <location filename="../smtk-import/smartrak.c" line="251"/>
- <location filename="../smtk-import/smartrak.c" line="321"/>
- <source>Notes</source>
- <translation>Примечания</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="510"/>
- <source>Show more details</source>
- <translation>Подробнее</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="513"/>
- <source>Yearly statistics</source>
- <translation>Статистика по годам</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="514"/>
- <source>Year</source>
- <translation>Год</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="515"/>
- <source>Total time</source>
- <translation>Общее время</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="516"/>
- <source>Average time</source>
- <translation>Среднее время</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="517"/>
- <source>Shortest time</source>
- <translation>Мин. время</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="518"/>
- <source>Longest time</source>
- <translation>Макс. время</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="519"/>
- <source>Average depth</source>
- <translation>Сред. глуб.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="520"/>
- <source>Min. depth</source>
- <translation>Мин. глуб.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="521"/>
- <source>Max. depth</source>
- <translation>Макс. глубина</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="523"/>
- <source>Min. SAC</source>
- <translation>Мин. SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="524"/>
- <source>Max. SAC</source>
- <translation>Макс. SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="525"/>
- <source>Average temp.</source>
- <translation>Сред. темп.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="526"/>
- <source>Min. temp.</source>
- <translation>Мин. темп.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="527"/>
- <source>Max. temp.</source>
- <translation>Макс. темп.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="528"/>
- <source>Back to list</source>
- <translation>Вернуться к списку</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="534"/>
- <source>Dive equipment</source>
- <translation>Снаряжение</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="537"/>
- <source>Work pressure</source>
- <translation>Раб. давл.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="538"/>
- <source>Start pressure</source>
- <translation>Нач. давл.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="539"/>
- <source>End pressure</source>
- <translation>Кон. давл.</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="547"/>
- <source>Dive status</source>
- <translation>Статистика погружения</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="522"/>
- <source>Average SAC</source>
- <translation>Средний SAC</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="531"/>
- <source>Dive No.</source>
- <translation>Погружение № </translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="532"/>
- <source>Dive profile</source>
- <translation>Профиль погружения</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="533"/>
- <source>Dive information</source>
- <translation>Информация о погружении</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="535"/>
- <location filename="../core/save-html.c" line="542"/>
- <source>Type</source>
- <translation>Тип</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="536"/>
- <source>Size</source>
- <translation>Объем</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="540"/>
- <source>Gas</source>
- <translation>Смесь</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="541"/>
- <source>Weight</source>
- <translation>Вес</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="543"/>
- <source>Events</source>
- <translation>События</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="544"/>
- <source>Name</source>
- <translation>Название</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="545"/>
- <source>Value</source>
- <translation>Значение</translation>
- </message>
- <message>
- <location filename="../core/save-html.c" line="546"/>
- <source>Coordinates</source>
- <translation>Координаты</translation>
- </message>
- <message>
<location filename="../core/worldmap-save.c" line="39"/>
<source>Date:</source>
<translation>Дата:</translation>
@@ -10572,110 +10765,6 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation>Заметки:</translation>
</message>
<message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="226"/>
- <source>N</source>
- <translation>С</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="91"/>
- <location filename="../core/qthelper.cpp" line="227"/>
- <source>S</source>
- <translation>Ю</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="228"/>
- <source>E</source>
- <translation>В</translation>
- </message>
- <message>
- <location filename="../core/qthelper.cpp" line="92"/>
- <location filename="../core/qthelper.cpp" line="229"/>
- <source>W</source>
- <translation>З</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="341"/>
- <source>Remote storage and local data diverged. Error: merge failed (%s)</source>
- <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="134"/>
- <source>Local cache directory %s corrupted - can&apos;t sync with Subsurface cloud storage</source>
- <translation>Директория локального кэша %s повреждена, синхронизация с облачным хранилищем невозможна</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="157"/>
- <location filename="../core/git-access.c" line="177"/>
- <source>Could not update local cache to newer remote data</source>
- <translation>Невозможно синхронизировать локальный кэш с облачным хранилищем</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="170"/>
- <source>Subsurface cloud storage corrupted</source>
- <translation>Облачное хранилице поверждено</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="285"/>
- <source>Could not update Subsurface cloud storage, try again later</source>
- <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="371"/>
- <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="405"/>
- <source>Remote storage and local data diverged</source>
- <translation>Данные в локальном и облачном хранилице отличаются</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="408"/>
- <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="417"/>
- <source>Problems with local cache of Subsurface cloud data</source>
- <translation>Проблема с локальным кэшем облачного хранилища</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="418"/>
- <source>Moved cache data to %s. Please try the operation again.</source>
- <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="737"/>
- <source>Error connecting to Subsurface cloud storage</source>
- <translation>Ошибка подключения к облачному хранилищу Subsurface</translation>
- </message>
- <message>
- <location filename="../core/git-access.c" line="740"/>
- <source>git clone of %s failed (%s)</source>
- <translation>Клонирование git-репозитория %s не удалось (%s)</translation>
- </message>
- <message>
- <location filename="../core/load-git.c" line="222"/>
- <location filename="../core/parse-xml.c" line="1300"/>
- <source>additional name for site: %s
-</source>
- <translation>другое название дайв-сайта: %s
-</translation>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="120"/>
- <location filename="../core/ostctools.c" line="152"/>
- <source>Unknown DC in dive %d</source>
- <translation>Неизвестный дайв-компьютер в погружении %d</translation>
- </message>
- <message>
- <location filename="../core/ostctools.c" line="165"/>
- <source>Error - %s - parsing dive %d</source>
- <translation>Ошибка %s в погружении %d</translation>
- </message>
- <message>
<location filename="../smtk-import/smartrak.c" line="247"/>
<source>Built</source>
<translation type="unfinished"/>
@@ -10759,155 +10848,120 @@ Is the Uemis Zurich plugged in correctly?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="91"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="103"/>
<source>Subsurface</source>
<translation>Subsurface</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="97"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="110"/>
<source>Dive list</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="112"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="125"/>
<source>Cloud credentials</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="126"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="139"/>
<source>Manage dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="138"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="141"/>
<source>Add dive manually</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="146"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="149"/>
<source>Manual sync with cloud</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Offline mode</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="164"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="167"/>
<source>Enable auto cloud sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="182"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="187"/>
<source>GPS</source>
<translation>GPS</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="185"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="190"/>
<source>GPS-tag dives</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="192"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="197"/>
<source>Upload GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="199"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="204"/>
<source>Download GPS data</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="206"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="211"/>
<source>Show GPS fixes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="215"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="220"/>
<source>Clear GPS cache</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="221"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="226"/>
<source>Preferences</source>
<translation>Настройки</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="230"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="237"/>
<source>Developer</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="232"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="239"/>
<source>App log</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="239"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="246"/>
<source>Theme information</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="246"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="253"/>
<source>User manual</source>
<translation>Руководство пользователя</translation>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="252"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="259"/>
<source>About</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>Run location service</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="283"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="304"/>
<source>No GPS source available</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../mobile-widgets/qml/main.qml" line="295"/>
+ <location filename="../mobile-widgets/qml/main.qml" line="316"/>
<source>Actions</source>
<translation type="unfinished"/>
</message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="9"/>
- <source>Hello World</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="13"/>
- <source>File</source>
- <translation>Файл</translation>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="15"/>
- <source>&amp;Open</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="19"/>
- <source>Exit</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="27"/>
- <source>Button 1 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="28"/>
- <source>Button 2 pressed</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../packaging/ios/Subsurface-mobile/main.qml" line="33"/>
- <source>May I have your attention, please?</source>
- <translation type="unfinished"/>
- </message>
</context>
<context>
<name>plannerDetails</name>
@@ -10985,6 +11039,24 @@ p, li { white-space: pre-wrap; }
<translation>м/мин</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
+ <location filename="../build/ui_plannerSettings.h" line="425"/>
+ <source>75% to 50% avg. depth</source>
+ <translation>75% - 50% ср. глубины</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
+ <location filename="../build/ui_plannerSettings.h" line="427"/>
+ <source>50% avg. depth to 6m</source>
+ <translation>50% ср. глубины - 6м</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
+ <location filename="../build/ui_plannerSettings.h" line="429"/>
+ <source>6m to surface</source>
+ <translation>6м - поверхность</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="175"/>
<location filename="../build/ui_plannerSettings.h" line="431"/>
<source>Descent</source>
@@ -11008,12 +11080,35 @@ p, li { white-space: pre-wrap; }
<translation>Алгоритм VPM-B</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
+ <source>Bühlmann deco</source>
+ <translation>Алгоритм Бюльмана</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="278"/>
<location filename="../build/ui_plannerSettings.h" line="445"/>
<source>Reserve gas</source>
<translation>Газовый резерв</translation>
</message>
<message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
+ <location filename="../build/ui_plannerSettings.h" line="446"/>
+ <location filename="../build/ui_plannerSettings.h" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="461"/>
+ <source>bar</source>
+ <translation>бар</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
+ <location filename="../build/ui_plannerSettings.h" line="437"/>
+ <location filename="../build/ui_plannerSettings.h" line="440"/>
+ <source>%</source>
+ <translation>%</translation>
+ </message>
+ <message>
<location filename="../desktop-widgets/plannerSettings.ui" line="320"/>
<location filename="../build/ui_plannerSettings.h" line="449"/>
<source>Postpone gas change if a stop is not required</source>
@@ -11032,12 +11127,10 @@ p, li { white-space: pre-wrap; }
<translation>GF low</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="307"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="416"/>
- <location filename="../build/ui_plannerSettings.h" line="437"/>
- <location filename="../build/ui_plannerSettings.h" line="440"/>
- <source>%</source>
- <translation>%</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
+ <location filename="../build/ui_plannerSettings.h" line="436"/>
+ <source>Plan backgas breaks</source>
+ <translation>Перерывы на основной газ</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="360"/>
@@ -11046,10 +11139,10 @@ p, li { white-space: pre-wrap; }
<translation>GF high</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
- <location filename="../build/ui_plannerSettings.h" line="441"/>
- <source>Drop to first depth</source>
- <translation>Падение к первой глубине</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
+ <location filename="../build/ui_plannerSettings.h" line="453"/>
+ <source>min</source>
+ <translation>мин</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="389"/>
@@ -11058,163 +11151,139 @@ p, li { white-space: pre-wrap; }
<translation>Последняя остановка на 6м</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="353"/>
- <location filename="../build/ui_plannerSettings.h" line="436"/>
- <source>Plan backgas breaks</source>
- <translation>Перерывы на основной газ</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
+ <source>Maximize bottom time allowed by gas and no decompression limits</source>
+ <translation>Увеличить донное время исходя из газов и NDL</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
- <location filename="../build/ui_plannerSettings.h" line="455"/>
- <source>Gas options</source>
- <translation>Газы</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
+ <location filename="../build/ui_plannerSettings.h" line="443"/>
+ <source>Recreational mode</source>
+ <translation>Рекреационный режим</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
- <location filename="../build/ui_plannerSettings.h" line="456"/>
- <source>Bottom SAC</source>
- <translation>SAC на дне</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="429"/>
+ <location filename="../build/ui_plannerSettings.h" line="441"/>
+ <source>Drop to first depth</source>
+ <translation>Падение к первой глубине</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="692"/>
- <location filename="../build/ui_plannerSettings.h" line="457"/>
- <source>Deco SAC</source>
- <translation>SAC на деко</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
+ <location filename="../build/ui_plannerSettings.h" line="452"/>
+ <source>Min. switch duration</source>
+ <translation>Мин. время переключения</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="601"/>
- <location filename="../build/ui_plannerSettings.h" line="458"/>
- <source>Bottom pO₂</source>
- <translation>pO₂ на дне</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
+ <location filename="../build/ui_plannerSettings.h" line="444"/>
+ <source>Safety stop</source>
+ <translation>Остановка безопасности</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="685"/>
- <location filename="../build/ui_plannerSettings.h" line="460"/>
- <source>Deco pO₂</source>
- <translation>pO₂ на деко</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
+ <source>Conservatism level</source>
+ <translation>Уровень консерватизма</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="515"/>
+ <location filename="../build/ui_plannerSettings.h" line="455"/>
+ <source>Gas options</source>
+ <translation>Газы</translation>
</message>
<message>
<location filename="../desktop-widgets/plannerSettings.ui" line="565"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="672"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="698"/>
<location filename="../build/ui_plannerSettings.h" line="462"/>
<location filename="../build/ui_plannerSettings.h" line="463"/>
<source>ℓ/min</source>
<translation>л/мин</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="632"/>
- <location filename="../build/ui_plannerSettings.h" line="468"/>
- <source>Display runtime</source>
- <translation>Показать отсчет</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="645"/>
- <location filename="../build/ui_plannerSettings.h" line="472"/>
- <source>Display segment duration</source>
- <translation>Показать время сегмента</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
- <location filename="../build/ui_plannerSettings.h" line="476"/>
- <source>Display transitions in deco</source>
- <translation>Показать переходы в деко</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="662"/>
- <location filename="../build/ui_plannerSettings.h" line="477"/>
- <source>Verbatim dive plan</source>
- <translation>Подробный план:</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="288"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="549"/>
- <location filename="../desktop-widgets/plannerSettings.ui" line="578"/>
- <location filename="../build/ui_plannerSettings.h" line="446"/>
- <location filename="../build/ui_plannerSettings.h" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="461"/>
- <source>bar</source>
- <translation>бар</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="121"/>
- <location filename="../build/ui_plannerSettings.h" line="425"/>
- <source>75% to 50% avg. depth</source>
- <translation>75% - 50% ср. глубины</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="138"/>
- <location filename="../build/ui_plannerSettings.h" line="427"/>
- <source>50% avg. depth to 6m</source>
- <translation>50% ср. глубины - 6м</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="155"/>
- <location filename="../build/ui_plannerSettings.h" line="429"/>
- <source>6m to surface</source>
- <translation>6м - поверхность</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="268"/>
- <source>Bühlmann deco</source>
- <translation>Алгоритм Бюльмана</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="370"/>
- <location filename="../build/ui_plannerSettings.h" line="453"/>
- <source>min</source>
- <translation>мин</translation>
- </message>
- <message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="396"/>
- <source>Maximize bottom time allowed by gas and no decompression limits</source>
- <translation>Увеличить донное время исходя из газов и NDL</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="594"/>
+ <source>m</source>
+ <translation>м</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="399"/>
- <location filename="../build/ui_plannerSettings.h" line="443"/>
- <source>Recreational mode</source>
- <translation>Рекреационный режим</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="606"/>
+ <source>Used to calculate best mix. Select best mix depth in &apos;Available gases&apos; table by entering gas depth, followed by &quot;B&quot; (best trimix mix) or &quot;BN&quot; (best nitrox mix)</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="436"/>
- <location filename="../build/ui_plannerSettings.h" line="452"/>
- <source>Min. switch duration</source>
- <translation>Мин. время переключения</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="613"/>
+ <location filename="../build/ui_plannerSettings.h" line="456"/>
+ <source>Bottom SAC</source>
+ <translation>SAC на дне</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="459"/>
- <location filename="../build/ui_plannerSettings.h" line="444"/>
- <source>Safety stop</source>
- <translation>Остановка безопасности</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="620"/>
+ <location filename="../build/ui_plannerSettings.h" line="458"/>
+ <source>Bottom pO₂</source>
+ <translation>pO₂ на дне</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="495"/>
- <source>Conservatism level</source>
- <translation>Уровень консерватизма</translation>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="627"/>
+ <source>Best mix END</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="608"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="634"/>
<location filename="../build/ui_plannerSettings.h" line="464"/>
<source>Notes</source>
<translation>Примечания</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="629"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="655"/>
<location filename="../build/ui_plannerSettings.h" line="466"/>
<source>In dive plan, show runtime (absolute time) of stops</source>
<translation>Показывать время отсчета для остановок (абсолютное время)</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="642"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="658"/>
+ <location filename="../build/ui_plannerSettings.h" line="468"/>
+ <source>Display runtime</source>
+ <translation>Показать отсчет</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="668"/>
<location filename="../build/ui_plannerSettings.h" line="470"/>
<source>In dive plan, show duration (relative time) of stops</source>
<translation>Показывать длительность остановок (относительное время)</translation>
</message>
<message>
- <location filename="../desktop-widgets/plannerSettings.ui" line="652"/>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="671"/>
+ <location filename="../build/ui_plannerSettings.h" line="472"/>
+ <source>Display segment duration</source>
+ <translation>Показать время сегмента</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="678"/>
<location filename="../build/ui_plannerSettings.h" line="474"/>
<source>In diveplan, list transitions or treat them as implicit</source>
<translation>Показывать переходы в списке или неявно учитывать их</translation>
</message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="681"/>
+ <location filename="../build/ui_plannerSettings.h" line="476"/>
+ <source>Display transitions in deco</source>
+ <translation>Показать переходы в деко</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="688"/>
+ <location filename="../build/ui_plannerSettings.h" line="477"/>
+ <source>Verbatim dive plan</source>
+ <translation>Подробный план:</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="711"/>
+ <location filename="../build/ui_plannerSettings.h" line="460"/>
+ <source>Deco pO₂</source>
+ <translation>pO₂ на деко</translation>
+ </message>
+ <message>
+ <location filename="../desktop-widgets/plannerSettings.ui" line="718"/>
+ <location filename="../build/ui_plannerSettings.h" line="457"/>
+ <source>Deco SAC</source>
+ <translation>SAC на деко</translation>
+ </message>
</context>
</TS> \ No newline at end of file
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-26 15:08:20 +0000