diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 491 |
1 files changed, 253 insertions, 238 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 1140afa0f..eab426f77 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -1544,7 +1544,7 @@ <context> <name>ContextDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="77"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/ContextDrawer.qml" line="76"/> <source>Actions</source> <translation>Действия</translation> </message> @@ -1607,42 +1607,42 @@ <translation>Назначение</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="44"/> + <location filename="../qt-models/cylindermodel.cpp" line="43"/> <source>cuft</source> <translation>куб. фут</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="48"/> + <location filename="../qt-models/cylindermodel.cpp" line="47"/> <source>ℓ</source> <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="229"/> + <location filename="../qt-models/cylindermodel.cpp" line="235"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="239"/> + <location filename="../qt-models/cylindermodel.cpp" line="247"/> <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="242"/> + <location filename="../qt-models/cylindermodel.cpp" line="250"/> <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="245"/> + <location filename="../qt-models/cylindermodel.cpp" line="253"/> <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="503"/> + <location filename="../qt-models/cylindermodel.cpp" line="522"/> <source>Cylinder cannot be removed</source> <translation>Баллон не может быть удален</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="504"/> + <location filename="../qt-models/cylindermodel.cpp" line="523"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -1770,6 +1770,11 @@ <source>Show on map</source> <translation>Показать на карте</translation> </message> + <message> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="160"/> + <source>Multiple Buddies</source> + <translation>Несколько напарников</translation> + </message> </context> <context> <name>DiveDetailsEdit</name> @@ -2017,7 +2022,7 @@ GPS location:</source> <translation>Нажмите кнопку '+' чтобы добавить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="255"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> @@ -2107,12 +2112,12 @@ GPS location:</source> <message> <location filename="../desktop-widgets/divelistview.cpp" line="897"/> <source>Load image from web</source> - <translation type="unfinished"/> + <translation>Загрузить фото из Web</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="974"/> <source>%1 does not appear to be an image</source> - <translation type="unfinished"/> + <translation>%1 не является картинкой</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="919"/> @@ -2753,6 +2758,11 @@ GPS location:</source> <source>%1 dive(s)</source> <translation>%1 погружение(й)</translation> </message> + <message> + <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="428"/> + <source>Multiple Buddies</source> + <translation>Несколько напарников</translation> + </message> </context> <context> <name>DivePlanner</name> @@ -2795,32 +2805,32 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="137"/> + <location filename="../qt-models/diveplannermodel.cpp" line="142"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="327"/> + <location filename="../qt-models/diveplannermodel.cpp" line="332"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="329"/> + <location filename="../qt-models/diveplannermodel.cpp" line="334"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="331"/> + <location filename="../qt-models/diveplannermodel.cpp" line="336"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="333"/> + <location filename="../qt-models/diveplannermodel.cpp" line="338"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="335"/> + <location filename="../qt-models/diveplannermodel.cpp" line="340"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> @@ -3607,7 +3617,7 @@ p, li { white-space: pre-wrap; } <context> <name>GlobalDrawer</name> <message> - <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="362"/> + <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="361"/> <source>Back</source> <translation>Назад</translation> </message> @@ -3697,7 +3707,7 @@ p, li { white-space: pre-wrap; } <message numerus="yes"> <location filename="../desktop-widgets/modeldelegates.cpp" line="503"/> <source>, %n dive(s) here)</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>, здесь %n дайв)</numerusform><numerusform>, здесь %n дайва)</numerusform><numerusform>, здесь %n дайвов)</numerusform><numerusform>, %n dive(s) here)</numerusform></translation> </message> <message> <location filename="../desktop-widgets/modeldelegates.cpp" line="508"/> @@ -4829,7 +4839,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="506"/> <location filename="../desktop-widgets/mainwindow.cpp" line="551"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1560"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1562"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> @@ -4841,7 +4851,7 @@ mixed from Air and using: <message> <location filename="../desktop-widgets/mainwindow.cpp" line="516"/> <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -4864,9 +4874,9 @@ mixed from Air and using: <location filename="../desktop-widgets/mainwindow.cpp" line="662"/> <location filename="../desktop-widgets/mainwindow.cpp" line="809"/> <location filename="../desktop-widgets/mainwindow.cpp" line="917"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4891,85 +4901,85 @@ mixed from Air and using: <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="992"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1864"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="994"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1866"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="998"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1000"/> <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="1045"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1047"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1259"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1261"/> <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="1262"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1264"/> <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="1267"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1269"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1268"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1270"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1587"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1589"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1588"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1590"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1685"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1687"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1689"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1803"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1805"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1804"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1806"/> <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="1815"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1817"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1816"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> <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="1993"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1995"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5021,7 +5031,7 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="315"/> <source>Firmware files (*.hex *.bin)</source> - <translation type="unfinished"/> + <translation>Файлы прошивки (*.hex *.bin)</translation> </message> </context> <context> @@ -5923,113 +5933,113 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="730"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="733"/> + <location filename="../profile-widget/profilewidget2.cpp" line="753"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="753"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1339"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1359"/> <source>Make first divecomputer</source> <translation>Сделать первым компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1341"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1361"/> <source>Delete this divecomputer</source> <translation>Удалить этот дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1355"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1375"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1358"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1378"/> <source> (Tank %1)</source> <translation> (Баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1366"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1386"/> <source>Add set-point change</source> <translation>Добавить замену установки</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1368"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1372"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1392"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1376"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1396"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1381"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1408"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1444"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1439"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1459"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1474"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1494"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1509"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1510"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1633"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1653"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1634"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1654"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1639"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1659"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6042,96 +6052,96 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="202"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="204"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="216"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="218"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="219"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="284"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="286"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="306"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="322"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="331"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="361"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="387"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="389"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="399"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="401"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="441"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="443"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="531"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="533"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="554"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="721"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="722"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="725"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="726"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="720"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="724"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1102"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1103"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6203,7 +6213,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message numerus="yes"> <location filename="../core/qthelper.cpp" line="962"/> <source>(%n dive(s))</source> - <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> + <translation><numerusform>(%n дайв)</numerusform><numerusform>(%n дайва)</numerusform><numerusform>(%n дайвов)</numerusform><numerusform>(%n dive(s))</numerusform></translation> </message> <message> <location filename="../core/qthelper.cpp" line="1232"/> @@ -6988,62 +6998,62 @@ Not all images have timestamps in the range between <context> <name>TestParse</name> <message> - <location filename="../tests/testparse.cpp" line="308"/> + <location filename="../tests/testparse.cpp" line="313"/> <source>Sample time</source> <translation>Выборка времени</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="310"/> + <location filename="../tests/testparse.cpp" line="315"/> <source>Sample depth</source> <translation>Выборка глубины</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="312"/> + <location filename="../tests/testparse.cpp" line="317"/> <source>Sample temperature</source> <translation>Выборка температуры</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="314"/> + <location filename="../tests/testparse.cpp" line="319"/> <source>Sample pO₂</source> <translation>Выборка pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="316"/> + <location filename="../tests/testparse.cpp" line="321"/> <source>Sample sensor1 pO₂</source> <translation>Выборка 1-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="318"/> + <location filename="../tests/testparse.cpp" line="323"/> <source>Sample sensor2 pO₂</source> <translation>Выборка 2-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="320"/> + <location filename="../tests/testparse.cpp" line="325"/> <source>Sample sensor3 pO₂</source> <translation>Выборка 3-го сеносора pO₂</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="322"/> + <location filename="../tests/testparse.cpp" line="327"/> <source>Sample CNS</source> <translation>Выборка CNS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="324"/> + <location filename="../tests/testparse.cpp" line="329"/> <source>Sample NDL</source> <translation>Выборка NDL</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="326"/> + <location filename="../tests/testparse.cpp" line="331"/> <source>Sample TTS</source> <translation>Выборка TTS</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="328"/> + <location filename="../tests/testparse.cpp" line="333"/> <source>Sample stopdepth</source> <translation>Выборка остановки</translation> </message> <message> - <location filename="../tests/testparse.cpp" line="330"/> + <location filename="../tests/testparse.cpp" line="335"/> <source>Sample pressure</source> <translation>Выборка давления</translation> </message> @@ -7662,7 +7672,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="737"/> + <location filename="../core/libdivecomputer.c" line="776"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -7673,7 +7683,7 @@ Maximum</source> <location filename="../core/cochran.c" line="309"/> <location filename="../core/cochran.c" line="315"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="232"/> <source>deco stop</source> <translation>деко стоп</translation> </message> @@ -7681,7 +7691,7 @@ Maximum</source> <location filename="../core/cochran.c" line="336"/> <location filename="../core/cochran.c" line="390"/> <location filename="../core/file.c" line="777"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="234"/> <source>ascent</source> <translation>подъем</translation> </message> @@ -7693,20 +7703,20 @@ Maximum</source> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>maxdepth</source> <translation>макс. глуб.</translation> </message> <message> <location filename="../core/cochran.c" line="358"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -7715,28 +7725,28 @@ Maximum</source> <location filename="../core/cochran.c" line="414"/> <location filename="../core/cochran.c" line="421"/> <location filename="../core/file.c" line="868"/> - <location filename="../core/libdivecomputer.c" line="225"/> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="242"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>gaschange</source> <translation>замена смеси</translation> </message> <message> <location filename="../core/cochran.c" line="370"/> <location filename="../core/cochran.c" line="409"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="233"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> <location filename="../core/cochran.c" line="379"/> <location filename="../core/cochran.c" line="426"/> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="235"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> <location filename="../core/cochran.c" line="395"/> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="237"/> <source>transmitter</source> <translation>передатчик</translation> </message> @@ -7998,12 +8008,17 @@ Maximum</source> <message> <location filename="../core/dive.c" line="33"/> <location filename="../core/equipment.c" line="88"/> - <location filename="../core/planner.c" line="1447"/> - <location filename="../core/planner.c" line="1450"/> + <location filename="../core/planner.c" line="1476"/> + <location filename="../core/planner.c" line="1479"/> <source>oxygen</source> <translation>кислород</translation> </message> <message> + <location filename="../core/dive.c" line="33"/> + <source>not used</source> + <translation>не используется</translation> + </message> + <message> <location filename="../core/dive.c" line="181"/> <source>pascal</source> <translation>Па</translation> @@ -8084,10 +8099,10 @@ Maximum</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="490"/> + <location filename="../core/divelist.c" line="491"/> <location filename="../core/equipment.c" line="84"/> - <location filename="../core/planner.c" line="1443"/> - <location filename="../core/planner.c" line="1446"/> + <location filename="../core/planner.c" line="1472"/> + <location filename="../core/planner.c" line="1475"/> <source>air</source> <translation>воздух</translation> </message> @@ -8250,205 +8265,200 @@ Maximum</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="210"/> + <location filename="../core/libdivecomputer.c" line="218"/> <location filename="../core/parse-xml.c" line="3317"/> <location filename="../core/uemis-downloader.c" line="134"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="231"/> <source>none</source> <translation>отсутствует</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="223"/> + <location filename="../core/libdivecomputer.c" line="236"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="238"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="239"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="240"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="224"/> + <location filename="../core/libdivecomputer.c" line="241"/> <source>safety stop</source> <translation>остановка безопасности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="243"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="225"/> + <location filename="../core/libdivecomputer.c" line="244"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="245"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="246"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="247"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>ниже пола</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="226"/> + <location filename="../core/libdivecomputer.c" line="248"/> <source>divetime</source> <translation>время погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>airtime</source> <translation>оставшееся время по воздуху</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="227"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>heading</source> <translation>направление</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="228"/> - <source>non stop time</source> - <translation>время без остановки</translation> - </message> - <message> - <location filename="../core/libdivecomputer.c" line="237"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>invalid event number</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="553"/> + <location filename="../core/libdivecomputer.c" line="592"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="571"/> + <location filename="../core/libdivecomputer.c" line="610"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="577"/> + <location filename="../core/libdivecomputer.c" line="616"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="587"/> + <location filename="../core/libdivecomputer.c" line="626"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="606"/> + <location filename="../core/libdivecomputer.c" line="645"/> <source>Error parsing temperature</source> <translation>Ошибка разбора температуры</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="626"/> + <location filename="../core/libdivecomputer.c" line="665"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="638"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="647"/> + <location filename="../core/libdivecomputer.c" line="686"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="672"/> + <location filename="../core/libdivecomputer.c" line="711"/> <source>Error obtaining divemode</source> <translation>Ошибка при получении режима погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="731"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="717"/> + <location filename="../core/libdivecomputer.c" line="756"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="723"/> + <location filename="../core/libdivecomputer.c" line="762"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="744"/> + <location filename="../core/libdivecomputer.c" line="783"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="882"/> + <location filename="../core/libdivecomputer.c" line="921"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="890"/> + <location filename="../core/libdivecomputer.c" line="929"/> <source>model=%u (0x%08x), firmware=%u (0x%08x), serial=%u (0x%08x)</source> <translation>модель=%u (0x%08x), прошивка=%u (0x%08x), серийный номер=%u (0x%08x)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="954"/> + <location filename="../core/libdivecomputer.c" line="993"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="998"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="980"/> + <location filename="../core/libdivecomputer.c" line="1019"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1019"/> + <location filename="../core/libdivecomputer.c" line="1058"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1065"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1048"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Insufficient privileges to open the device %s %s (%s)</source> <translation>Нет прав, чтобы открыть устройство %s %s (%s)</translation> </message> @@ -8508,177 +8518,182 @@ Maximum</source> </message> <message> <location filename="../core/planner.c" line="574"/> - <location filename="../core/planner.c" line="840"/> - <location filename="../core/planner.c" line="845"/> - <location filename="../core/planner.c" line="871"/> - <location filename="../core/planner.c" line="881"/> + <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="874"/> + <location filename="../core/planner.c" line="900"/> + <location filename="../core/planner.c" line="910"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/planner.c" line="584"/> - <source>based on Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> - <translation>на сонове алгоритма Бюльмана ZHL-16C с GFlow = %d и GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="589"/> - <source>based on VPM-B at nominal conservatism</source> - <translation>на основе VPM-B с номинальным консерватизмом</translation> - </message> - <message> - <location filename="../core/planner.c" line="591"/> - <source>based on VPM-B at +%d conservatism</source> - <translation>на основе VPM-B с консерватизмом +%d</translation> - </message> - <message> - <location filename="../core/planner.c" line="593"/> + <location filename="../core/planner.c" line="812"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="597"/> - <source>recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> - <translation>рекреационный режим на основе алгорита Бюльмана ZHL-16B с GFlow = %d и GFhigh = %d</translation> - </message> - <message> - <location filename="../core/planner.c" line="602"/> + <location filename="../core/planner.c" line="586"/> <source>Subsurface dive plan (surface interval </source> <translation>План погружения Subsurface (пов. интервал</translation> </message> <message> - <location filename="../core/planner.c" line="607"/> + <location filename="../core/planner.c" line="590"/> <source>Subsurface dive plan</source> <translation>План погружения Subsurface</translation> </message> <message> - <location filename="../core/planner.c" line="610"/> - <source><div>Runtime: %dmin</div><br></source> - <translation><div>Рантайм: %dмин</div><br></translation> + <location filename="../core/planner.c" line="593"/> + <source>Runtime: %dmin<br></div></source> + <translation>Рантайм: %dмин<br></div></translation> </message> <message> - <location filename="../core/planner.c" line="615"/> + <location filename="../core/planner.c" line="598"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/planner.c" line="618"/> + <location filename="../core/planner.c" line="601"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../core/planner.c" line="621"/> + <location filename="../core/planner.c" line="604"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/planner.c" line="624"/> + <location filename="../core/planner.c" line="607"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../core/planner.c" line="667"/> + <location filename="../core/planner.c" line="650"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="675"/> + <location filename="../core/planner.c" line="658"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/planner.c" line="688"/> + <location filename="../core/planner.c" line="671"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="695"/> + <location filename="../core/planner.c" line="678"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/planner.c" line="740"/> + <location filename="../core/planner.c" line="723"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/planner.c" line="743"/> - <location filename="../core/planner.c" line="747"/> + <location filename="../core/planner.c" line="726"/> + <location filename="../core/planner.c" line="730"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/planner.c" line="756"/> - <location filename="../core/planner.c" line="768"/> + <location filename="../core/planner.c" line="739"/> + <location filename="../core/planner.c" line="751"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="791"/> + <location filename="../core/planner.c" line="774"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/planner.c" line="793"/> + <location filename="../core/planner.c" line="776"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/planner.c" line="812"/> + <location filename="../core/planner.c" line="796"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/planner.c" line="814"/> + <location filename="../core/planner.c" line="798"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/planner.c" line="818"/> + <location filename="../core/planner.c" line="803"/> + <source>Deco model: Bühlmann ZHL-16C with GFlow = %d and GFhigh = %d</source> + <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d и GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="808"/> + <source>Deco model: VPM-B at nominal conservatism</source> + <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> + </message> + <message> + <location filename="../core/planner.c" line="810"/> + <source>Deco model: VPM-B at +%d conservatism</source> + <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> + </message> + <message> + <location filename="../core/planner.c" line="816"/> + <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFlow = %d and GFhigh = %d</source> + <translation>Деко-модель: Рекреационный режим по модели Bühlmann ZHL-16B с GFlow = %d и GFhigh = %d</translation> + </message> + <message> + <location filename="../core/planner.c" line="824"/> + <source>ATM pressure: %dmbar (%d%s)<br></div></source> + <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> + </message> + <message> + <location filename="../core/planner.c" line="842"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/planner.c" line="820"/> - <source>Gas consumption:</source> - <translation>Расход газов:</translation> + <location filename="../core/planner.c" line="844"/> + <source>Gas consumption (based on SAC</source> + <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/planner.c" line="841"/> + <location filename="../core/planner.c" line="869"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/planner.c" line="846"/> + <location filename="../core/planner.c" line="875"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/planner.c" line="848"/> + <location filename="../core/planner.c" line="877"/> <source>%.0f%s/%.0f%s of %s (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s %s (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/planner.c" line="850"/> + <location filename="../core/planner.c" line="879"/> <source>%.0f%s (%.0f%s during planned ascent) of %s</source> <translation>%.0f%s (%.0f%s в запланированном подъеме) на %s</translation> </message> <message> - <location filename="../core/planner.c" line="868"/> + <location filename="../core/planner.c" line="897"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="878"/> + <location filename="../core/planner.c" line="907"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="1205"/> + <location filename="../core/planner.c" line="1234"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1451"/> + <location filename="../core/planner.c" line="1480"/> <source>ean</source> <translation>ean</translation> </message> @@ -9103,8 +9118,8 @@ EADD: %d%s </message> <message> <location filename="../core/save-html.c" line="509"/> - <location filename="../smtk-import/smartrak.c" line="251"/> - <location filename="../smtk-import/smartrak.c" line="321"/> + <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="318"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -9675,77 +9690,77 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Заметки:</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Built</source> <translation>Построен</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>Sank</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="247"/> + <location filename="../smtk-import/smartrak.c" line="244"/> <source>SankTime</source> <translation>Затонул</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Reason</source> <translation>Причина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Nationality</source> <translation>Порт приписки</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="248"/> + <location filename="../smtk-import/smartrak.c" line="245"/> <source>Shipyard</source> <translation>Верфь</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>ShipType</source> <translation>Тип судна</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Length</source> <translation>Длительность</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="249"/> + <location filename="../smtk-import/smartrak.c" line="246"/> <source>Beam</source> <translation>Ширина</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Draught</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Displacement</source> <translation>Водоизмещение</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="250"/> + <location filename="../smtk-import/smartrak.c" line="247"/> <source>Cargo</source> <translation>Карго</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="263"/> + <location filename="../smtk-import/smartrak.c" line="260"/> <source>Wreck Data</source> <translation>Данные рэка</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Altitude</source> <translation>Высота</translation> </message> <message> - <location filename="../smtk-import/smartrak.c" line="320"/> + <location filename="../smtk-import/smartrak.c" line="317"/> <source>Depth</source> <translation>Глубина</translation> </message> @@ -9996,7 +10011,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/plannerSettings.ui" line="320"/> <source>Postpone gas change if a stop is not required</source> - <translation>Отложить замену гаща если остановка не требуется</translation> + <translation>Отложить замену газа если остановка не требуется</translation> </message> <message> <location filename="../desktop-widgets/plannerSettings.ui" line="323"/> |