diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1599 |
1 files changed, 903 insertions, 696 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 57dd031a9..7b4610f6c 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -47,66 +47,86 @@ <translation>Выбор удаленного устройства Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="32"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="172"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="39"/> <source>Discovered devices</source> <translation>Найденные устройства</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="41"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="22"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="42"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="54"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="43"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="35"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="44"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="83"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <source>Bluetooth mode</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="201"/> + <source>Auto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="206"/> + <source>Force LE</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="211"/> + <source>Force classical</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="229"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="40"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="96"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="242"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="41"/> <source>Clear</source> <translation>Очистить</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="119"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="66"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="33"/> <source>Local Bluetooth device details</source> <translation>Локальное устройство Bluetooth:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="128"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="75"/> <source>Name: </source> <translation>Название:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="142"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="89"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="35"/> <source>Address:</source> <translation>Адрес:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="171"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="118"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="37"/> <source>Bluetooth powered on</source> <translation>Bluetooth включен</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="193"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="140"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="38"/> <source>Turn on/off</source> <translation>Вкл/Выкл</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="203"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.ui" line="150"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="34"/> <source>Select device:</source> <translation>Выберите устройство:</translation> @@ -117,22 +137,22 @@ <translation>Название:</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="60"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="61"/> <source>Could not initialize Winsock version 2.2</source> <translation>Ошибка инициализации Winsock 2.2</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="138"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="139"/> <source>Trying to turn on the local Bluetooth device...</source> <translation>Включение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="141"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="142"/> <source>Trying to turn off the local Bluetooth device...</source> <translation>Выключение локального устройства Bluetooth...</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="173"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="174"/> <source>Remote devices list was cleared.</source> <translation>Список удаленных устройств очищен.</translation> </message> @@ -164,22 +184,22 @@ </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="231"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="365"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="385"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="371"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="391"/> <source>UNPAIRED</source> <translation>Не сопряжено</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="235"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="370"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="383"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="376"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="389"/> <source>PAIRED</source> <translation>Сопряжено</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="238"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="375"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="381"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="390"/> <source>AUTHORIZED_PAIRED</source> <translation>Авторизовано,Сопряжено</translation> </message> @@ -189,113 +209,113 @@ <translation>%1 (%2) [Состояние: %3]</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="270"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="276"/> <source>The device %1 can be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для подключения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="283"/> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="401"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="407"/> <source>The device %1 must be paired in order to be used. Please use the context menu for pairing options.</source> <translation>Чтобы использовать %1, оно должно быть сопряжено. Используйте контекстное меню для сопряжения.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="289"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="295"/> <source>A device needs a non-zero address for a connection.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="312"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="318"/> <source>The local device was changed.</source> <translation>Локальное устройство было изменено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="332"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="338"/> <source>Pair</source> <translation>Сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="333"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="339"/> <source>Remove pairing</source> <translation>Удалить сопряжение</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="349"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="355"/> <source>Trying to pair device %1</source> <translation>Попытка сопряжения с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="359"/> <source>Trying to unpair device %1</source> <translation>Попытка удалить сопряжение с %1</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="372"/> <source>Device %1 was unpaired.</source> <translation>Устройство %1 не сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="373"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="379"/> <source>Device %1 was paired.</source> <translation>Устройство %1 сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="378"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="384"/> <source>Device %1 was paired and is authorized.</source> <translation>Устройство %1 авторизовано и сопряжено.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="404"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="410"/> <source>The device %1 can now be used for connection. You can press the Save button.</source> <translation>Устройство %1 может быть использовано для соединения. Нажмите кнопку Сохранить.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="416"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="422"/> <source>Local device error: %1.</source> <translation>Ошибка локального устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="417"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="423"/> <source>Pairing error. If the remote device requires a custom PIN code, please try to pair the devices using your operating system. </source> <translation>Ошибка сопряжения. Если устройство требует специальный PIN-код, попробуйте сопряжение средствами операционной системы.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="419"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="425"/> <source>Unknown error</source> <translation>Неизвестная ошибка</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="428"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="434"/> <source>The Bluetooth adaptor is powered off, power it on before doing discovery.</source> <translation>Адаптер Bluetooth выключен, включите его перед выполнением поиска.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="431"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> <source>Writing to or reading from the device resulted in an error.</source> <translation>Ошибка по время чтения/записи устройства.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="437"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="443"/> <source>An unknown error has occurred.</source> <translation>Произошла неизвестная ошибка.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="442"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="448"/> <source>Device discovery error: %1.</source> <translation>Ошибка обнаружения устройства: %1.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="471"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="502"/> <source>Not available</source> <translation>Недоступно</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="478"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="509"/> <source>The local Bluetooth adapter cannot be accessed.</source> <translation>Ошибка доступа к локальному Bluetooth-адапетру.</translation> </message> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="528"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="559"/> <source>The device discovery agent was not created because the %1 address does not match the physical adapter address of any local Bluetooth device.</source> <translation>Адрес %1 не соответствует ни одному адресу локального устройства Bluetooth. Обнаружение не будет выполнено.</translation> </message> @@ -316,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="249"/> + <location filename="../qt-models/filtermodels.cpp" line="266"/> <source>No buddies</source> <translation>Без напарника</translation> </message> @@ -1636,84 +1656,84 @@ <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1364"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> <source>Backup dive computer settings</source> <translation>Создать рез. копию настроек</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1365"/> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1386"/> - <source>Backup files (*.xml)</source> - <translation>Резервные копии (*.xml)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1375"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <source>Backup files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1369"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1379"/> <source>XML backup error</source> <translation>XML-ошибка при создании рез. копии</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1370"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1380"/> <source>An error occurred while saving the backup file. %1</source> <translation>Ошибка при сохранении резервной копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1383"/> <source>Backup succeeded</source> <translation>Резервная копия создана</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1374"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1384"/> <source>Your settings have been saved to: %1</source> <translation>Ваши настройки сохранены в %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1385"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1395"/> <source>Restore dive computer settings</source> <translation>Восстановить настройки дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1391"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1401"/> <source>XML restore error</source> <translation>XML-ошибка при восстановлении</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1392"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1402"/> <source>An error occurred while restoring the backup file. %1</source> <translation>Ошибка при восстановлении из рез. копии. %1</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1396"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1406"/> <source>Restore succeeded</source> <translation>Восстановление успешно</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1397"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> <source>Your settings have been restored successfully.</source> <translation>Настройки были успешно восстановлены.</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1407"/> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1417"/> <source>Select firmware file</source> <translation>Выберите файл прошивки</translation> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1408"/> - <source>All files (*.*)</source> - <translation>Все файлы (*.*)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1418"/> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1468"/> - <source>Choose file for dive computer download logfile</source> - <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1479"/> + <source>Log files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1469"/> - <source>Log files (*.log)</source> - <translation>Файлы журналов (*.log)</translation> + <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1478"/> + <source>Choose file for dive computer download logfile</source> + <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> </context> <context> @@ -1793,27 +1813,27 @@ <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="259"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="271"/> + <location filename="../qt-models/cylindermodel.cpp" line="265"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Глубина переключения на деко-газ. Рассчитывается из настроек деко pO₂, если не указано вручную.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="274"/> + <location filename="../qt-models/cylindermodel.cpp" line="268"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Вычислено с учетом настройки донного pO₂. Ввод MOD меняет O₂%, установите '*' для лучшего O₂% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="277"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Вычислено с учетом настройки END лучшей смеси. Ввод MND меняет He%, установите '*' для лучшего He% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="257"/> + <location filename="../qt-models/cylindermodel.cpp" line="251"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -1927,27 +1947,27 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> <source>Dive details</source> <translation>Детали погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="153"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="161"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="231"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> <source>Multiple Buddies</source> <translation>Несколько напарников</translation> </message> @@ -1955,104 +1975,104 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> <source>Dive %1</source> <translation>Погружение %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="105"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> <source>Location:</source> <translation>Место:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="118"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> <source>Coordinates:</source> <translation>Координаты:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="131"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> <source>Use current GPS location:</source> <translation>Использовать текущее местоположение GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="146"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> <source>Depth:</source> <translation>Глубина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="159"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> <source>Duration:</source> <translation>Длительность:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="173"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="186"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="199"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="212"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="225"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="238"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="252"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="265"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> <source>Gas mix:</source> <translation>Смесь:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="279"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> <source>Start Pressure:</source> <translation>Нач. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> <source>End Pressure:</source> <translation>Кон. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="305"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="318"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="332"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> <source>Notes:</source> <translation>Заметки:</translation> </message> @@ -2128,23 +2148,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="158"/> + <location filename="../profile-widget/diveeventitem.cpp" line="160"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="176"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="175"/> + <location filename="../profile-widget/diveeventitem.cpp" line="177"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -2309,12 +2329,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -2559,76 +2579,76 @@ GPS location:</source> <translation>Сохранить погружение как макрос TeX.</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="139"/> <source>Export UDDF file as</source> <translation>Файл для UDDF экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="141"/> - <source>UDDF files (*.uddf *.UDDF)</source> - <translation>UDDF файлы (*.uddf *.UDDF)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="140"/> + <source>UDDF files</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="144"/> <location filename="../desktop-widgets/divelogexportdialog.cpp" line="148"/> - <source>Export CSV file as</source> - <translation>Файл для CSV экспорта</translation> + <source>CSV files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="145"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="149"/> - <source>CSV files (*.csv *.CSV)</source> - <translation>CSV файлы (*.csv *.CSV)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <source>HTML files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="155"/> - <source>Export world map</source> - <translation>Файл для экспорта карты</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="156"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="180"/> - <source>HTML files (*.html)</source> - <translation>HTML файлы (*.html)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> + <source>TeX files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="160"/> - <source>Export Subsurface XML</source> - <translation>Экспорт Subsurface XML</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="143"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="147"/> + <source>Export CSV file as</source> + <translation>Файл для CSV экспорта</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="161"/> - <source>XML files (*.xml *.ssrf)</source> - <translation>XML файлы (*.xml *.ssrf)</translation> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="154"/> + <source>Export world map</source> + <translation>Файл для экспорта карты</translation> + </message> + <message> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="159"/> + <source>Export Subsurface XML</source> + <translation>Экспорт Subsurface XML</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="169"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="168"/> <source>Save image depths</source> <translation>Экспорт глубин фотографий</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="172"/> <source>Export to TeX file</source> <translation>Экспорт в TeX-файл</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="173"/> - <source>TeX files (*.tex)</source> - <translation>Файлы TeX (*.tex)</translation> - </message> - <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="179"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="178"/> <source>Export HTML files as</source> <translation>Экспортировать HTML файл как</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="195"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="194"/> <source>Please wait, exporting...</source> <translation>Ожидайте, идет экспорт...</translation> </message> <message> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="230"/> - <location filename="../desktop-widgets/divelogexportdialog.cpp" line="412"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="229"/> + <location filename="../desktop-widgets/divelogexportdialog.cpp" line="411"/> <source>Can't open file %s</source> <translation>Невозможно открыть файл %s</translation> </message> @@ -2923,7 +2943,7 @@ GPS location:</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="443"/> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> <source>Multiple Buddies</source> <translation>Несколько напарников</translation> </message> @@ -2969,41 +2989,61 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="155"/> + <location filename="../qt-models/diveplannermodel.cpp" line="159"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="190"/> - <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <location filename="../qt-models/diveplannermodel.cpp" line="194"/> + <location filename="../qt-models/diveplannermodel.cpp" line="279"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="371"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="373"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="381"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="383"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <source>min</source> + <translation>мин</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <source>m</source> + <translation>м</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <source>ft</source> + <translation>фут</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <source>Stop times</source> + <translation type="unfinished"/> + </message> </context> <context> <name>DivePlannerWidget</name> @@ -3036,107 +3076,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> <source>Ambient pressure</source> <translation>Внешнее давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> <source>Gradient factor</source> <translation>Градиент-фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -3456,71 +3496,71 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Choose Bluetooth download mode</source> <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="129"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="132"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="376"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="402"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <source>Log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> <source>Choose file for dive computer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="428"/> - <source>Retry download</source> - <translation>Повторить загрузку</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <source>Dump files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="377"/> - <source>Log files (*.log)</source> - <translation>Файлы журналов (*.log)</translation> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <source>Retry download</source> + <translation>Повторить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <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="403"/> - <source>Dump files (*.bin)</source> - <translation>Дамп-файлы (*.bin)</translation> - </message> </context> <context> <name>DownloadFromDiveComputer</name> @@ -3589,7 +3629,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3615,7 +3655,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3645,37 +3685,37 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="199"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="210"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3706,12 +3746,12 @@ p, li { white-space: pre-wrap; } <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Чтобы отключиться от Facebook, используйте пункт меню "Поделиться".</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="346"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation> </message> @@ -3905,7 +3945,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="305"/> + <location filename="../qt-models/filtermodels.cpp" line="314"/> <source>No location set</source> <translation>Место не указано</translation> </message> @@ -3962,6 +4002,11 @@ p, li { white-space: pre-wrap; } <source>Country</source> <translation>Страна</translation> </message> + <message> + <location filename="../desktop-widgets/locationInformation.ui" line="162"/> + <source>Update location on map</source> + <translation type="unfinished"/> + </message> </context> <context> <name>LocationInformationModel</name> @@ -3985,29 +4030,29 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="62"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="69"/> <source>Merge into current site</source> <translation>Объеденить с текущим сайтом</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="71"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="86"/> <source>Merging dive sites</source> <translation>Объединение дайв-сайтов</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="72"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="87"/> <source>You are about to merge dive sites, you can't undo that action Are you sure you want to continue?</source> <translation>Операция объединения дайв-сайтов необратима. Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4025,8 +4070,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="516"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="548"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> <source>Notes</source> <translation>Основное</translation> </message> @@ -4047,19 +4092,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="297"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="302"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="298"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="303"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="547"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4124,123 +4169,123 @@ p, li { white-space: pre-wrap; } <translation>Длительность</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Extra Info</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="52"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="54"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="77"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="81"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="85"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="97"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="98"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="101"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="102"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> <source>Add weight system</source> <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>OC</source> <translation>Откр. цикл</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="106"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="110"/> <source>Freedive</source> <translation>Фридайв</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="294"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="299"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="295"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="300"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="334"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="339"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="341"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="343"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="348"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="474"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="507"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="502"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="712"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> <source>New dive site</source> <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4253,451 +4298,451 @@ p, li { white-space: pre-wrap; } <translation>Файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="87"/> + <location filename="../desktop-widgets/mainwindow.ui" line="82"/> <source>&Log</source> <translation>Журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="104"/> + <location filename="../desktop-widgets/mainwindow.ui" line="99"/> <source>&View</source> <translation>Вид</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="120"/> + <location filename="../desktop-widgets/mainwindow.ui" line="115"/> <source>&Help</source> <translation>Помощь</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="129"/> + <location filename="../desktop-widgets/mainwindow.ui" line="124"/> <source>&Import</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="138"/> + <location filename="../desktop-widgets/mainwindow.ui" line="133"/> <source>&Edit</source> <translation>Редактирование</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="143"/> + <location filename="../desktop-widgets/mainwindow.ui" line="138"/> <source>Share on</source> <translation>Поделиться</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="157"/> + <location filename="../desktop-widgets/mainwindow.ui" line="152"/> <source>&New logbook</source> <translation>Новый журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="160"/> + <location filename="../desktop-widgets/mainwindow.ui" line="155"/> <source>New</source> <translation>Новый</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="168"/> + <location filename="../desktop-widgets/mainwindow.ui" line="163"/> <source>&Open logbook</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="166"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> <source>Open</source> <translation>Открыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="179"/> + <location filename="../desktop-widgets/mainwindow.ui" line="174"/> <source>&Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="182"/> + <location filename="../desktop-widgets/mainwindow.ui" line="177"/> <source>Save</source> <translation>Сохранить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="190"/> + <location filename="../desktop-widgets/mainwindow.ui" line="185"/> <source>Sa&ve as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="193"/> + <location filename="../desktop-widgets/mainwindow.ui" line="188"/> <source>Save as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="201"/> + <location filename="../desktop-widgets/mainwindow.ui" line="196"/> <source>&Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="204"/> + <location filename="../desktop-widgets/mainwindow.ui" line="199"/> <source>Close</source> <translation>Закрыть</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="212"/> + <location filename="../desktop-widgets/mainwindow.ui" line="207"/> <source>&Print</source> <translation>Печать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="220"/> + <location filename="../desktop-widgets/mainwindow.ui" line="215"/> <source>P&references</source> <translation>Настройки</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="231"/> + <location filename="../desktop-widgets/mainwindow.ui" line="226"/> <source>&Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="242"/> + <location filename="../desktop-widgets/mainwindow.ui" line="237"/> <source>Import from &dive computer</source> <translation>Импорт из дайвкомпьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="250"/> + <location filename="../desktop-widgets/mainwindow.ui" line="245"/> <source>Import &GPS data from Subsurface web service</source> <translation>Импорт координат из веб-сервиса Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="258"/> + <location filename="../desktop-widgets/mainwindow.ui" line="253"/> <source>Edit device &names</source> <translation>Названия дайвкомпьютеров</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="263"/> + <location filename="../desktop-widgets/mainwindow.ui" line="258"/> <source>&Add dive</source> <translation>Добавить погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="271"/> + <location filename="../desktop-widgets/mainwindow.ui" line="266"/> <source>&Edit dive</source> <translation>Редактировать погружение</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="276"/> + <location filename="../desktop-widgets/mainwindow.ui" line="271"/> <source>&Copy dive components</source> <translation>Копировать параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="284"/> + <location filename="../desktop-widgets/mainwindow.ui" line="279"/> <source>&Paste dive components</source> <translation>Вставить параметры погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="292"/> + <location filename="../desktop-widgets/mainwindow.ui" line="287"/> <source>&Renumber</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="303"/> + <location filename="../desktop-widgets/mainwindow.ui" line="298"/> <source>Auto &group</source> <translation>Авто-группировка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="308"/> + <location filename="../desktop-widgets/mainwindow.ui" line="303"/> <source>&Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="316"/> + <location filename="../desktop-widgets/mainwindow.ui" line="311"/> <source>&Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="324"/> + <location filename="../desktop-widgets/mainwindow.ui" line="319"/> <source>&Profile</source> <translation>Профиль</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="332"/> + <location filename="../desktop-widgets/mainwindow.ui" line="327"/> <source>&Info</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="340"/> + <location filename="../desktop-widgets/mainwindow.ui" line="335"/> <source>&All</source> <translation>Все</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="348"/> + <location filename="../desktop-widgets/mainwindow.ui" line="343"/> <source>P&revious DC</source> <translation>Пред. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="356"/> + <location filename="../desktop-widgets/mainwindow.ui" line="351"/> <source>&Next DC</source> <translation>След. компьютер</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="364"/> + <location filename="../desktop-widgets/mainwindow.ui" line="359"/> <source>&About Subsurface</source> <translation>О Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="372"/> + <location filename="../desktop-widgets/mainwindow.ui" line="367"/> <source>User &manual</source> <translation>Руководство пользователя</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="380"/> + <location filename="../desktop-widgets/mainwindow.ui" line="375"/> <source>&Map</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="388"/> + <location filename="../desktop-widgets/mainwindow.ui" line="383"/> <source>P&lan dive</source> <translation>Планировщик</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="396"/> + <location filename="../desktop-widgets/mainwindow.ui" line="391"/> <source>&Import log files</source> <translation>Импорт журналов</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="399"/> + <location filename="../desktop-widgets/mainwindow.ui" line="394"/> <source>Import divelog files from other applications</source> <translation>Импортировать журнал погружений из другой программы</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="407"/> + <location filename="../desktop-widgets/mainwindow.ui" line="402"/> <source>Import &from divelogs.de</source> <translation>Импорт с сайта divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="415"/> + <location filename="../desktop-widgets/mainwindow.ui" line="410"/> <source>&Full screen</source> <translation>Полный экран</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="418"/> + <location filename="../desktop-widgets/mainwindow.ui" line="413"/> <source>Toggle full screen</source> <translation>Переключить полноэкранный режим</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="446"/> + <location filename="../desktop-widgets/mainwindow.ui" line="421"/> <source>&Check for updates</source> <translation>Проверить обновления</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="451"/> + <location filename="../desktop-widgets/mainwindow.ui" line="426"/> <source>&Export</source> <translation>Экспорт</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="454"/> + <location filename="../desktop-widgets/mainwindow.ui" line="429"/> <source>Export dive logs</source> <translation>Экспорт </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="462"/> + <location filename="../desktop-widgets/mainwindow.ui" line="437"/> <source>Configure &dive computer</source> <translation>Настройки дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="473"/> + <location filename="../desktop-widgets/mainwindow.ui" line="448"/> <source>Edit &dive in planner</source> <translation>Редактировать в планировщике</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="485"/> + <location filename="../desktop-widgets/mainwindow.ui" line="460"/> <source>Toggle pO₂ graph</source> <translation>График pO₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="497"/> + <location filename="../desktop-widgets/mainwindow.ui" line="472"/> <source>Toggle pN₂ graph</source> <translation>График pN₂</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="509"/> + <location filename="../desktop-widgets/mainwindow.ui" line="484"/> <source>Toggle pHe graph</source> <translation>График pHe</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="521"/> + <location filename="../desktop-widgets/mainwindow.ui" line="496"/> <source>Toggle DC reported ceiling</source> <translation>Потолок компьютера</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="533"/> + <location filename="../desktop-widgets/mainwindow.ui" line="508"/> <source>Toggle calculated ceiling</source> <translation>Расчетный потолок</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="545"/> + <location filename="../desktop-widgets/mainwindow.ui" line="520"/> <source>Toggle calculating all tissues</source> <translation>Расчет всех тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="557"/> + <location filename="../desktop-widgets/mainwindow.ui" line="532"/> <source>Toggle calculated ceiling with 3m increments</source> <translation>3м шаг для расчетного потолка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="569"/> + <location filename="../desktop-widgets/mainwindow.ui" line="544"/> <source>Toggle heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="581"/> + <location filename="../desktop-widgets/mainwindow.ui" line="556"/> <source>Toggle MOD</source> <translation>MOD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="593"/> + <location filename="../desktop-widgets/mainwindow.ui" line="568"/> <source>Toggle EAD, END, EADD</source> <translation>EAD, END, EADD</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="605"/> + <location filename="../desktop-widgets/mainwindow.ui" line="580"/> <source>Toggle NDL, TTS</source> <translation>NDL, TTS</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="617"/> + <location filename="../desktop-widgets/mainwindow.ui" line="592"/> <source>Toggle SAC rate</source> <translation>SAC</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="629"/> + <location filename="../desktop-widgets/mainwindow.ui" line="604"/> <source>Toggle ruler</source> <translation>Рулетка</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="641"/> + <location filename="../desktop-widgets/mainwindow.ui" line="616"/> <source>Scale graph</source> <translation>Альтернативный масштаб</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="653"/> + <location filename="../desktop-widgets/mainwindow.ui" line="628"/> <source>Toggle pictures</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="665"/> - <source>Toggle tank bar</source> - <translation>Замена смесей</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="640"/> + <source>Toggle gas bar</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.ui" line="648"/> <source>&Filter divelist</source> <translation>Фильтр погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="688"/> + <location filename="../desktop-widgets/mainwindow.ui" line="663"/> <source>Toggle tissue heat-map</source> <translation>Насыщение тканей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="693"/> + <location filename="../desktop-widgets/mainwindow.ui" line="668"/> <source>User &survey</source> <translation>Опрос пользователей</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> + <location filename="../desktop-widgets/mainwindow.ui" line="673"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> + <location filename="../desktop-widgets/mainwindow.ui" line="681"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> <source>&Redo</source> <translation>Повторить</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="714"/> + <location filename="../desktop-widgets/mainwindow.ui" line="689"/> <source>&Find moved images</source> <translation>Найти перемещенные фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> + <location filename="../desktop-widgets/mainwindow.ui" line="694"/> <source>Open c&loud storage</source> <translation>Открыть облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="724"/> + <location filename="../desktop-widgets/mainwindow.ui" line="699"/> <source>Save to clo&ud storage</source> <translation>Сохранить в облаке</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="729"/> + <location filename="../desktop-widgets/mainwindow.ui" line="704"/> <source>&Manage dive sites</source> <translation>Управление дайв-сайтами</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="734"/> + <location filename="../desktop-widgets/mainwindow.ui" line="709"/> <source>Dive Site &Edit</source> <translation>Редактирование дайв-сайта</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="739"/> + <location filename="../desktop-widgets/mainwindow.ui" line="714"/> <source>Facebook</source> <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="744"/> + <location filename="../desktop-widgets/mainwindow.ui" line="719"/> <source>Take cloud storage online</source> <translation>Подключить облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> <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="530"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> <source>Scanning images...(this can take a while)</source> <translation>Поиск изображений, подождите...</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="705"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4707,105 +4752,221 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <source>Template backup created</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <source>The following backup printing templates were created: + +%1 + +Location: +%2 + +Please note that as of this version of Subsurface the default templates +are read-only and should not be edited directly, since the application +can overwrite them on startup.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="916"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Попытка редактирования погружения, созданного не вручную.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1116"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <source>Dive log files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>Cochran</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <source>Liquivision</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <source>Suunto</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <source>UDCF</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <source>UDDF</source> + <translation>UDDF</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <source>XML</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> + <source>Divesoft</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> + <source>Datatrak/WLog</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> + <source>MkVI files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <source>APD log viewer</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <source>OSTCtools</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> + <source>DAN DL7</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>CSV</source> + <translation>CSV</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <source>All files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> <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="1299"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1388"/> <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="1304"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> <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="1833"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> - <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>Файлы погружений (*.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 (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Все файлы (*)</translation> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -4813,7 +4974,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> + <location filename="../map-widget/qml/MapWidget.qml" line="252"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -4821,22 +4982,22 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidgetContextMenu</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="15"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open location in Google Maps</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="16"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy location to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="17"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy location to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/MapWidgetContextMenu.qml" line="18"/> + <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -4844,7 +5005,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidgetError</name> <message> - <location filename="../mobile-widgets/qml/MapWidgetError.qml" line="10"/> + <location filename="../map-widget/qml/MapWidgetError.qml" line="10"/> <source>MapWidget.qml failed to load! The QML modules QtPositioning and QtLocation could be missing!</source> <translation type="unfinished"/> @@ -4896,8 +5057,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="329"/> - <source>Firmware files (*.hex *.bin)</source> - <translation>Файлы прошивки (*.hex *.bin)</translation> + <source>Firmware files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -4921,89 +5082,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>Open circuit</source> <translation>Открытый цикл</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="341"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="433"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="434"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="435"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="436"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="437"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="439"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="440"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="441"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="442"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="443"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="446"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="447"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="455"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="456"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="465"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="470"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> <source>psi</source> <translation>psi</translation> </message> @@ -5117,8 +5278,8 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/preferences_defaults.cpp" line="23"/> - <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> - <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> + <source>Subsurface files</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5332,33 +5493,33 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Формат даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Формат даты. Часто используемые описатели</p><p>d (день месяца)</p><p>ddd (день недели)</p><p>M (номер месяца)</p><p>MMM (назв. месяца)</p><p>yy/yyyy (2/4-циферный номер года)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="87"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="135"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> <source>Use UI language default</source> <translation>Из настроек языка интерфейса</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="97"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Используется там, где не хватает места для длинного формата даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="100"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> <source>Short format</source> <translation>Short format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="129"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> <source>Time format</source> <translation>Формат времени</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="142"/> + <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Формат времени</p><p>Часто используемые описатели</p><p>h (часы в 12-часовом формате)</p><p>H (часы в 24-часовом формате)</p><p>mm (минуты)</p><p>ss (секунды)</p><p>t/tt (a/p или am/pm)</p></body></html></translation> </message> @@ -5368,30 +5529,38 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>Язык</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="58"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="75"/> <source>Restart required</source> <translation>Необходим перезапуск</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="76"/> <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="81"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="87"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="96"/> + <source>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> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="105"/> <source>Literal characters</source> <translation>Специальные символы</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="82"/> - <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="88"/> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="100"/> <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>Неизвестные символы в формате времени. -будут отображаться как есть. Возможно это не то, чего вы хотели. -См. http://doc.qt.io/qt-5/qdatetime.html#toString</translation> +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_language.cpp" line="106"/> + <source>Non-special character(s) in date format. +</source> + <translation type="unfinished"/> </message> </context> <context> @@ -5801,45 +5970,70 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/printoptions.cpp" line="131"/> + <location filename="../desktop-widgets/printoptions.cpp" line="158"/> + <location filename="../desktop-widgets/printoptions.cpp" line="194"/> + <location filename="../desktop-widgets/printoptions.cpp" line="226"/> + <source>Read-only template!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <source>The template '%1' is read-only and cannot be edited. +Please export this template to a different file.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="148"/> <source>Import template file</source> <translation>Импорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="132"/> - <location filename="../desktop-widgets/printoptions.cpp" line="145"/> - <source>HTML files (*.html)</source> - <translation>HTML файлы (*.html)</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="149"/> + <location filename="../desktop-widgets/printoptions.cpp" line="180"/> + <source>HTML files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="159"/> + <location filename="../desktop-widgets/printoptions.cpp" line="195"/> + <source>The destination template '%1' is read-only and cannot be overwritten.</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="144"/> + <location filename="../desktop-widgets/printoptions.cpp" line="179"/> <source>Export template files as</source> <translation>Экспорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="155"/> + <location filename="../desktop-widgets/printoptions.cpp" line="219"/> <source>This action cannot be undone!</source> <translation>Это действие не может быть отменено!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="156"/> - <source>Delete template: %1?</source> - <translation>Удалить шаблон: %1?</translation> + <location filename="../desktop-widgets/printoptions.cpp" line="220"/> + <source>Delete template '%1'?</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/printoptions.cpp" line="227"/> + <source>The template '%1' is read-only and cannot be deleted.</source> + <translation type="unfinished"/> </message> </context> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="777"/> + <location filename="../profile-widget/profilewidget2.cpp" line="778"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="802"/> + <location filename="../profile-widget/profilewidget2.cpp" line="803"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> @@ -5849,22 +6043,17 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> - <source> (Tank %1)</source> - <translation> (Баллон %1)</translation> - </message> - <message> <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="773"/> + <location filename="../profile-widget/profilewidget2.cpp" line="774"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="776"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> @@ -5874,6 +6063,11 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <source> (cyl. %1)</source> + <translation> (баллон %1)</translation> + </message> + <message> <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> @@ -5906,8 +6100,8 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> - <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> - <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> + <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> + <translation type="unfinished"/> </message> <message> <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> @@ -5953,147 +6147,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="380"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6191,7 +6385,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>min</source> <translation>мин</translation> </message> @@ -6199,7 +6393,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="127"/> - <location filename="../desktop-widgets/templatelayout.h" line="112"/> + <location filename="../desktop-widgets/templatelayout.h" line="115"/> <source>h</source> <translation>ч</translation> </message> @@ -6207,7 +6401,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <location filename="../core/divelogexportlogic.cpp" line="56"/> <location filename="../core/divelogexportlogic.cpp" line="92"/> <location filename="../core/helpers.h" line="39"/> - <location filename="../desktop-widgets/templatelayout.h" line="113"/> + <location filename="../desktop-widgets/templatelayout.h" line="116"/> <source>sec</source> <translation>с</translation> </message> @@ -6534,7 +6728,7 @@ Not all images have timestamps in the range between </message> <message> <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> - <source>Image files (*.jpg *.jpeg)</source> + <source>Image files</source> <translation type="unfinished"/> </message> <message> @@ -6648,8 +6842,8 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.ui" line="377"/> - <source>Import messages (Errors, warnings, etc)</source> - <translation>Журнал сообщений (ошибки, предупреждения)</translation> + <source>Import messages (errors, warnings, etc)</source> + <translation type="unfinished"/> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="51"/> @@ -6658,81 +6852,87 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> - <source>SmartTrak files (*.slg *.SLG);;All files (*)</source> - <translation>Файлы SmartTrak (*.slg *.SLG);;Все файлы (*)</translation> + <source>SmartTrak files</source> + <translation type="unfinished"/> </message> <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="52"/> <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> - <source>Open Subsurface files</source> - <translation>Открыть файлы Subsurface</translation> + <source>All files</source> + <translation type="unfinished"/> </message> <message> - <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="64"/> - <source>Subsurface files (*.ssrf *SSRF *.xml *.XML);;All files (*)</source> - <translation>Файлы Subsurface (*.ssrf *SSRF *.xml *.XML);;Все файлы (*)</translation> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="63"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../smtk-import/smrtk2ssrfc_window.cpp" line="62"/> + <source>Open Subsurface files</source> + <translation>Открыть файлы Subsurface</translation> </message> </context> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="375"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="376"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>Dive date: %1 </source> <translation>Дата погружения: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Duration: %1 </source> <translation>Длительность: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="401"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="404"/> <source>Dive location: %1 </source> <translation>Местоположение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="407"/> <source>Buddy: %1 </source> <translation>Партнер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="410"/> <source>Divemaster: %1 </source> <translation>Дайвмастер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="413"/> <source> %1</source> <translation> @@ -6927,7 +7127,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="129"/> + <location filename="../qt-models/filtermodels.cpp" line="159"/> <source>No suit set</source> <translation>Костюм не указан</translation> </message> @@ -7053,32 +7253,32 @@ Files with inappropriate date/time</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="46"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> <source>Load image(s) from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="49"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> <source>Delete selected images</source> <translation>Удалить выбранные изображения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Delete all images</source> <translation>Удалить все изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Deleting Images</source> <translation>Удаление изображений</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="89"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> <source>Are you sure you want to delete all images?</source> <translation>Удалить все изображения?</translation> </message> @@ -7256,7 +7456,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="154"/> + <location filename="../qt-models/filtermodels.cpp" line="179"/> <source>Empty tags</source> <translation>Без меток</translation> </message> @@ -7660,24 +7860,24 @@ mixed from Air and using: <translation>Сервер вернул следующую информацию:</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="118"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="117"/> <source>Subsurface is checking every two weeks if a new version is available. If you don't want Subsurface to continue checking, please click Decline.</source> <translation>Каждый две недели Subsurface проверяет наличие новой версии. Если вы не хотите проверять обновления, нажмите "Отказываюсь".</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="119"/> <source>Decline</source> <translation>Отказаться</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="121"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="120"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../desktop-widgets/updatemanager.cpp" line="123"/> + <location filename="../desktop-widgets/updatemanager.cpp" line="122"/> <source>Automatic check for updates</source> <translation>Автоматическая проверка обновлений</translation> </message> @@ -7939,8 +8139,8 @@ Language: %1</source> <context> <name>WinBluetoothDeviceDiscoveryAgent</name> <message> - <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="551"/> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="582"/> + <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="613"/> <source>No error</source> <translation>Без ошибок</translation> </message> @@ -8064,21 +8264,12 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="791"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> </context> <context> - <name>gettectFromC</name> - <message> - <location filename="../core/profile.c" line="1364"/> - <source>Density: %.1fg/ℓ -</source> - <translation type="unfinished"/> - </message> -</context> -<context> <name>gettextFromC</name> <message> <location filename="../core/cochran.c" line="304"/> @@ -8409,8 +8600,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1135"/> - <location filename="../core/planner.c" line="1138"/> + <location filename="../core/planner.c" line="1143"/> + <location filename="../core/planner.c" line="1146"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8495,15 +8686,10 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/dive.c" line="1856"/> - <source>(%s) or (%s)</source> - <translation>(%s) или (%s)</translation> - </message> - <message> - <location filename="../core/divelist.c" line="680"/> + <location filename="../core/divelist.c" line="682"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1131"/> - <location filename="../core/planner.c" line="1134"/> + <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1142"/> <source>air</source> <translation>воздух</translation> </message> @@ -8513,27 +8699,27 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="199"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../core/equipment.c" line="204"/> + <location filename="../core/equipment.c" line="200"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../core/equipment.c" line="205"/> + <location filename="../core/equipment.c" line="201"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../core/equipment.c" line="206"/> + <location filename="../core/equipment.c" line="202"/> <source>backplate</source> <translation>спинка</translation> </message> <message> - <location filename="../core/equipment.c" line="207"/> + <location filename="../core/equipment.c" line="203"/> <source>clip-on</source> <translation>карабины</translation> </message> @@ -8716,23 +8902,23 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="752"/> + <location filename="../core/git-access.c" line="757"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="755"/> + <location filename="../core/git-access.c" line="760"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="778"/> + <location filename="../core/git-access.c" line="783"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/import-divinglog.c" line="312"/> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8874,75 +9060,75 @@ Maximum</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="771"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="777"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="798"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="805"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="939"/> + <location filename="../core/libdivecomputer.c" line="940"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="958"/> + <location filename="../core/libdivecomputer.c" line="959"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1020"/> + <location filename="../core/libdivecomputer.c" line="1021"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1025"/> + <location filename="../core/libdivecomputer.c" line="1026"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1046"/> + <location filename="../core/libdivecomputer.c" line="1047"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1085"/> + <location filename="../core/libdivecomputer.c" line="1086"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1094"/> + <location filename="../core/libdivecomputer.c" line="1095"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1119"/> + <location filename="../core/libdivecomputer.c" line="1120"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1128"/> + <location filename="../core/libdivecomputer.c" line="1129"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1275"/> + <location filename="../core/parse-xml.c" line="1132"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s @@ -8950,19 +9136,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse-xml.c" line="1337"/> + <location filename="../core/parse.c" line="495"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1703"/> + <location filename="../core/load-git.c" line="1707"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1711"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> @@ -8978,19 +9164,19 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка %s в погружении %d</translation> </message> <message> - <location filename="../core/parse-xml.c" line="528"/> + <location filename="../core/parse-xml.c" line="389"/> <source>Strange percentage reading %s </source> <translation>Странное значение процентов %s </translation> </message> <message> - <location filename="../core/parse-xml.c" line="2099"/> + <location filename="../core/parse-xml.c" line="1593"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3998"/> + <location filename="../core/parse-xml.c" line="2034"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -9009,8 +9195,8 @@ You can create this logfile by selecting the corresponding checkbox in the downl <location filename="../core/plannernotes.c" line="401"/> <location filename="../core/plannernotes.c" line="407"/> <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="482"/> - <location filename="../core/plannernotes.c" line="494"/> + <location filename="../core/plannernotes.c" line="489"/> + <location filename="../core/plannernotes.c" line="501"/> <source>Warning:</source> <translation>Внимание:</translation> </message> @@ -9036,16 +9222,6 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> - <source>dive plan</b> (Overlapping dives detected)</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin %s</source> - <translation type="unfinished"/> - </message> - <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Рантайм: %dмин<br></div></translation> @@ -9148,6 +9324,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>SAC</translation> </message> <message> + <location filename="../core/plannernotes.c" line="454"/> + <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="458"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="461"/> + <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> <location filename="../core/plannernotes.c" line="99"/> <location filename="../core/plannernotes.c" line="105"/> @@ -9170,6 +9361,16 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>план погружения</b> создан</translation> </message> <message> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin%s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d%% и GFhigh = %d%%</translation> @@ -9215,22 +9416,17 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="451"/> + <location filename="../core/plannernotes.c" line="452"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s из <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> - <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> - <translation>%.0f%s (%.0f%s в запланированном подъеме) из <span style='color: red;'><b>%s</b></span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="479"/> + <location filename="../core/plannernotes.c" line="486"/> <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/plannernotes.c" line="491"/> + <location filename="../core/plannernotes.c" line="498"/> <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> @@ -9240,12 +9436,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1139"/> + <location filename="../core/planner.c" line="1147"/> <source>ean</source> <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1317"/> + <location filename="../core/profile.c" line="1375"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9254,251 +9450,257 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1329"/> + <location filename="../core/profile.c" line="1387"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1335"/> + <location filename="../core/profile.c" line="1393"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1338"/> + <location filename="../core/profile.c" line="1396"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1340"/> + <location filename="../core/profile.c" line="1398"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1342"/> + <location filename="../core/profile.c" line="1400"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1344"/> + <location filename="../core/profile.c" line="1402"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1346"/> + <location filename="../core/profile.c" line="1404"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1349"/> + <location filename="../core/profile.c" line="1407"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1447"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1439"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1325"/> + <location filename="../core/profile.c" line="1383"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1357"/> + <location filename="../core/profile.c" line="1416"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1361"/> + <location filename="../core/profile.c" line="1422"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1378"/> + <location filename="../core/profile.c" line="1427"/> + <source>Density: %.1fg/ℓ +</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/profile.c" line="1442"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1386"/> + <location filename="../core/profile.c" line="1450"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1390"/> + <location filename="../core/profile.c" line="1454"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1392"/> + <location filename="../core/profile.c" line="1456"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1395"/> + <location filename="../core/profile.c" line="1459"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1462"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1406"/> + <location filename="../core/profile.c" line="1470"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1409"/> + <location filename="../core/profile.c" line="1473"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1411"/> + <location filename="../core/profile.c" line="1475"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1415"/> + <location filename="../core/profile.c" line="1479"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1417"/> + <location filename="../core/profile.c" line="1481"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1420"/> + <location filename="../core/profile.c" line="1484"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1423"/> + <location filename="../core/profile.c" line="1487"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1429"/> + <location filename="../core/profile.c" line="1493"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1435"/> + <location filename="../core/profile.c" line="1499"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1437"/> + <location filename="../core/profile.c" line="1501"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1440"/> + <location filename="../core/profile.c" line="1504"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1536"/> + <location filename="../core/profile.c" line="1601"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1540"/> - <location filename="../core/profile.c" line="1544"/> - <location filename="../core/profile.c" line="1548"/> + <location filename="../core/profile.c" line="1605"/> + <location filename="../core/profile.c" line="1609"/> + <location filename="../core/profile.c" line="1613"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1552"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1556"/> + <location filename="../core/profile.c" line="1621"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1560"/> - <location filename="../core/profile.c" line="1564"/> + <location filename="../core/profile.c" line="1625"/> + <location filename="../core/profile.c" line="1629"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1571"/> + <location filename="../core/profile.c" line="1636"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1596"/> + <location filename="../core/profile.c" line="1661"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -10363,22 +10565,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="955"/> + <location filename="../core/save-git.c" line="956"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="964"/> + <location filename="../core/save-git.c" line="965"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="997"/> + <location filename="../core/save-git.c" line="998"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1237"/> + <location filename="../core/save-git.c" line="1238"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10391,117 +10593,117 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Мобильный Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> + <location filename="../mobile-widgets/qml/main.qml" line="110"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="117"/> + <location filename="../mobile-widgets/qml/main.qml" line="118"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="133"/> + <location filename="../mobile-widgets/qml/main.qml" line="134"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="250"/> + <location filename="../mobile-widgets/qml/main.qml" line="251"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="136"/> + <location filename="../mobile-widgets/qml/main.qml" line="137"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="146"/> + <location filename="../mobile-widgets/qml/main.qml" line="147"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="155"/> - <source>Apply GPS Fixes</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="162"/> + <location filename="../mobile-widgets/qml/main.qml" line="163"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Offline mode</source> <translation>Режим "Без Интернета"</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="181"/> + <location filename="../mobile-widgets/qml/main.qml" line="182"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="186"/> + <location filename="../mobile-widgets/qml/main.qml" line="187"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="195"/> + <location filename="../mobile-widgets/qml/main.qml" line="196"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="277"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="200"/> + <location filename="../mobile-widgets/qml/main.qml" line="201"/> <source>Upload GPS data</source> <translation>Выгрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="208"/> + <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <source>Apply GPS fixes</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="209"/> <source>Download GPS data</source> <translation>Загрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="216"/> + <location filename="../mobile-widgets/qml/main.qml" line="217"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="226"/> + <location filename="../mobile-widgets/qml/main.qml" line="227"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="258"/> + <location filename="../mobile-widgets/qml/main.qml" line="259"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="261"/> + <location filename="../mobile-widgets/qml/main.qml" line="262"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="269"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="242"/> + <location filename="../mobile-widgets/qml/main.qml" line="243"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="234"/> + <location filename="../mobile-widgets/qml/main.qml" line="235"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> @@ -10604,51 +10806,56 @@ p, li { white-space: pre-wrap; } <translation>Планирование</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <source>Min. switch duration O₂% below 100%</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="419"/> <source>VPM-B deco</source> <translation>Алгоритм VPM-B</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="268"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="426"/> <source>Bühlmann deco</source> <translation>Алгоритм Бюльмана</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="278"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> <source>Reserve gas</source> <translation>Газовый резерв</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="288"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="585"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="614"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="261"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="592"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="621"/> <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="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="406"/> <source>%</source> <translation>%</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="293"/> <source>Postpone gas change if a stop is not required</source> <translation>Отложить замену газа если остановка не требуется</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="296"/> <source>Only switch at required stops</source> <translation>Переключение на необх. остановках</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="353"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="363"/> <source>Plan backgas breaks</source> <translation>Перерывы на основной газ</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="370"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="793"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="800"/> <source>min</source> <translation>мин</translation> </message> @@ -10668,153 +10875,153 @@ p, li { white-space: pre-wrap; } <translation>Рекреационный режим</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="429"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="336"/> <source>Drop to first depth</source> <translation>Падение к первой глубине</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="436"/> - <source>Min. switch duration</source> - <translation>Мин. время переключения</translation> - </message> - <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="459"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="449"/> <source>Safety stop</source> <translation>Остановка безопасности</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="485"/> <source>Conservatism level</source> <translation>Уровень консерватизма</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="505"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="495"/> <source>+</source> <translation>+</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="518"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="515"/> + <source>Dive mode</source> + <translation>Режим</translation> + </message> + <message> + <location filename="../desktop-widgets/plannerSettings.ui" line="525"/> <source>Gas options</source> <translation>Газы</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="539"/> - <location filename="../desktop-widgets/plannerSettings.ui" line="601"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="546"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="608"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="633"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="640"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="734"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="741"/> <source>Compute variations of plan (performance cost)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="737"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="744"/> <source>Display plan variations</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> <source>SAC factor</source> <translation>Коэф. SAC</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="761"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="768"/> <source>Used to calculate minimum gas. Consider two divers with possibly increased SAC after OoG event.</source> <translation>Используется для расчета мин. газа. Два дайвера с высоким SAC в случае потери газа.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="783"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> <source>Problem solving time</source> <translation>Время решения проблемы</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="790"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="797"/> <source>Used to calculate minimum gas. Additional time at max. depth after OoG event.</source> <translation>Используется для расчета мин. газа. Доп. время на макс. глубине в случае потери газа.</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="630"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="637"/> <source>Used to calculate best mix. Select best mix depth in 'Available gases' table by entering gas depth, followed by "B" (best trimix mix) or "BN" (best nitrox mix)</source> <translation>Используется для расчета лучшей смеси. Укажите глубину лучшей смеси в таблице доступных газов, указав глубину и букву "B" (лучший тримикс) или "BN" (лучший найтрокс)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="343"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="313"/> <source>GFLow</source> <translation>GFLow</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="360"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="303"/> <source>GFHigh</source> <translation>GFHigh</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="649"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> <source>Bottom SAC</source> <translation>SAC на дне</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="656"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> <source>Bottom pO₂</source> <translation>pO₂ на дне</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="663"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> <source>Best mix END</source> <translation>END лучшей смеси</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="670"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="677"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="715"/> <source>In dive plan, show runtime (absolute time) of stops</source> <translation>Показывать время отсчета для остановок (абсолютное время)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="711"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="718"/> <source>Display runtime</source> <translation>Показать отсчет</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="721"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="728"/> <source>In dive plan, show duration (relative time) of stops</source> <translation>Показывать длительность остановок (относительное время)</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="724"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="731"/> <source>Display segment duration</source> <translation>Показать время сегмента</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="705"/> <source>In diveplan, list transitions or treat them as implicit</source> <translation>Показывать переходы в списке или неявно учитывать их</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="701"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="708"/> <source>Display transitions in deco</source> <translation>Показать переходы в деко</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="691"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="698"/> <source>Verbatim dive plan</source> <translation>Подробный план:</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="747"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="754"/> <source>Deco pO₂</source> <translation>pO₂ на деко</translation> </message> <message> - <location filename="../desktop-widgets/plannerSettings.ui" line="552"/> + <location filename="../desktop-widgets/plannerSettings.ui" line="559"/> <source>Deco SAC</source> <translation>SAC на деко</translation> </message> |