diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 770 |
1 files changed, 413 insertions, 357 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index dd8b02a39..57dd031a9 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <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="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <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="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <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="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -2052,67 +2060,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Нет профиля для отображения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -2120,23 +2128,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -2174,23 +2182,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Учетные данные в облаке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> @@ -2198,102 +2206,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Разбить выделенные погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 не является картинкой</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> @@ -2301,12 +2309,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <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="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -2966,27 +2974,33 @@ GPS location:</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> @@ -3022,112 +3036,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Индекс баллона</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Внешнее давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Градиент-фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> @@ -3580,7 +3589,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="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3606,7 +3615,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="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Производитель : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Дайв-компьютер:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <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="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Повторить</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Подключить облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <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="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <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="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <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"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <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="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <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="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <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="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <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="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <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="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <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="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <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="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <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="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Геопоиск дайв-сайтов</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Включить геокодирование для дайв-сайтов</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Искать сайты без координат GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Один формат для существующих погружений</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Формат названия дайв-сайта</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Облачное хранилище Subsurface</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Облачное хранилище Subsurface (данные подтверждены)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Импорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <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> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Экспорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Это действие не может быть отменено!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Удалить шаблон: %1?</translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <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="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <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> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <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="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Метки</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Дата погружения: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Длительность: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %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="402"/> <source>Buddy: %1 </source> <translation>Партнер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Дайвмастер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7441,7 +7455,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -8395,8 +8409,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8481,15 +8495,15 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>воздух</translation> </message> @@ -8718,7 +8732,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8976,7 +8990,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -8992,21 +9006,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <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"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>изменение SP</translation> @@ -9022,195 +9036,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <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> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <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/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <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/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <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/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <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/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>план погружения</b> (поверх. интервал </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>план погружения</b> создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <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> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <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/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <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="438"/> + <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="463"/> + <location filename="../core/plannernotes.c" line="479"/> <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="475"/> + <location filename="../core/plannernotes.c" line="491"/> <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="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9807,6 +9837,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Статистика погружения</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Откр. цикл</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Фридайв</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Все (статистика по поездкам)</translation> @@ -9842,97 +9897,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(нет погружений)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10162,6 +10217,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Длительность:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>мин</translation> @@ -10267,7 +10323,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Глубина</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>путевая точка выше потолка</translation> </message> @@ -10307,22 +10363,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> |