diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2017-12-28 20:30:47 -0800 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2017-12-28 20:30:47 -0800 |
| commit | b641fc8464ba8b4b6af39354f998ad24e5aba5b4 (patch) | |
| tree | c51a525afb6990df06f013a3e86c25a103865fb0 /translations/subsurface_ru_RU.ts | |
| parent | 34236e3c84acd76ecb26a8abb4e10ccada4636ff (diff) | |
| download | subsurface-b641fc8464ba8b4b6af39354f998ad24e5aba5b4.tar.gz | |
Latest translations
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 768 |
1 files changed, 399 insertions, 369 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 7b4610f6c..b25211ad2 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -323,12 +323,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="532"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="533"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="541"/> <source>Searches for buddies and divemasters</source> <translation>Поиск партнеров и инструкторов</translation> </message> @@ -336,7 +336,7 @@ <context> <name>BuddyFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="266"/> + <location filename="../qt-models/filtermodels.cpp" line="287"/> <source>No buddies</source> <translation>Без напарника</translation> </message> @@ -1947,132 +1947,127 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="45"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="46"/> <source>Dive details</source> <translation>Детали погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="139"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="140"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="154"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="155"/> <source>Cancel edit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="162"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> - <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="232"/> - <source>Multiple Buddies</source> - <translation>Несколько напарников</translation> - </message> </context> <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="90"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="109"/> <source>Dive %1</source> <translation>Погружение %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="94"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="106"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="125"/> <source>Location:</source> <translation>Место:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="122"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="141"/> <source>Coordinates:</source> <translation>Координаты:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="135"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="154"/> <source>Use current GPS location:</source> <translation>Использовать текущее местоположение GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="150"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="169"/> <source>Depth:</source> <translation>Глубина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/> <source>Duration:</source> <translation>Длительность:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="177"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="196"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="190"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="209"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="203"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="222"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="216"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="235"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="229"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="248"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="242"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="261"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="256"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="275"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="269"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="288"/> <source>Gas mix:</source> <translation>Смесь:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="302"/> <source>Start Pressure:</source> <translation>Нач. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="296"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="315"/> <source>End Pressure:</source> <translation>Кон. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="328"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="322"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="341"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="336"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="355"/> <source>Notes:</source> <translation>Заметки:</translation> </message> @@ -3025,22 +3020,22 @@ GPS location:</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1039"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1045"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1048"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1095"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3383,112 +3378,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="167"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> <source>no dives were selected</source> <translation>не выбраны погружения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="177"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Не найден стиль для экспорта в divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> <source>failed to create zip file for upload: %s</source> <translation>не удалось создать ZIP файл для загрузки: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> <source>internal error</source> <translation>внутренняя ошибка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="259"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> <source>Conversion of dive %1 to divelogs.de format failed</source> <translation>Ошибка преобразования погружения %1 в формат divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="287"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="275"/> <source>error writing zip file: %s zip error %d system error %d - %s</source> <translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="745"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -3517,47 +3512,47 @@ p, li { white-space: pre-wrap; } <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="262"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="263"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="287"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="288"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="364"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="366"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="390"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> <source>Choose file for dive computer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="416"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="417"/> <source>Retry download</source> <translation>Повторить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="378"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="380"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> @@ -3630,6 +3625,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="197"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3695,27 +3692,32 @@ p, li { white-space: pre-wrap; } <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="224"/> + <source>Rescan</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="232"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="221"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="233"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="278"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="292"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="286"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="300"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3788,6 +3790,24 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>FilterBase</name> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="515"/> + <source>Select All</source> + <translation>Выбрать все</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="516"/> + <source>Unselect All</source> + <translation>Отменить выделение</translation> + </message> + <message> + <location filename="../desktop-widgets/simplewidgets.cpp" line="517"/> + <source>Invert Selection</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>FilterWidget</name> <message> <location filename="../desktop-widgets/listfilter.ui" line="14"/> @@ -3804,6 +3824,11 @@ p, li { white-space: pre-wrap; } <source>Filter this list</source> <translation>Отфильтровать список</translation> </message> + <message> + <location filename="../desktop-widgets/listfilter.ui" line="57"/> + <source>...</source> + <translation>...</translation> + </message> </context> <context> <name>FilterWidget2</name> @@ -3904,7 +3929,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="559"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -3945,7 +3970,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="314"/> + <location filename="../qt-models/filtermodels.cpp" line="340"/> <source>No location set</source> <translation>Место не указано</translation> </message> @@ -4070,8 +4095,8 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="27"/> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="447"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="530"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="570"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="529"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="568"/> <source>Notes</source> <translation>Основное</translation> </message> @@ -4104,7 +4129,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="569"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="567"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4265,27 +4290,27 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="477"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="513"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="512"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="736"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="734"/> <source>New dive site</source> <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1040"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1038"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1041"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1039"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4699,7 +4724,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1599"/> + <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> @@ -4710,39 +4735,39 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="672"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="666"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="671"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> <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="705"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="856"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="703"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4771,202 +4796,202 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="730"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> <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="856"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="854"/> <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="916"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="914"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="974"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1063"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1069"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> <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="1116"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1114"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1295"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1337"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1628"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1626"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <source>DiveLogs.de</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1316"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <source>JDiveLog</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> - <source>DiveLogs.de</source> + <source>Liquivision</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> - <source>JDiveLog</source> + <source>Suunto</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> - <source>Liquivision</source> + <source>UDCF</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> - <source>Suunto</source> - <translation type="unfinished"/> + <source>UDDF</source> + <translation>UDDF</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> - <source>UDCF</source> + <source>XML</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> - <source>UDDF</source> - <translation>UDDF</translation> + <source>Divesoft</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> - <source>XML</source> + <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1324"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> - <source>Divesoft</source> + <source>MkVI files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1325"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1369"/> - <source>Datatrak/WLog</source> + <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1370"/> - <source>MkVI files</source> + <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> - <source>APD log viewer</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1328"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> - <source>OSTCtools</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1329"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1373"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1374"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1385"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> <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="1388"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1386"/> <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="1393"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1717"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1818"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1819"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1811"/> <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="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1999"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5014,7 +5039,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="644"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> @@ -5097,74 +5122,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="506"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="510"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="508"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> - <location filename="../desktop-widgets/diveplanner.cpp" line="519"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="517"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="528"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="526"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="533"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="531"/> <source>psi</source> <translation>psi</translation> </message> @@ -6147,124 +6172,124 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="140"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="294"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="141"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="195"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="192"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="203"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="200"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="235"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="232"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="318"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="315"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="323"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="332"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="333"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="407"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="330"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="374"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="371"/> <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="380"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="377"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="421"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="442"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="456"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="464"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="461"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="470"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="502"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="499"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="512"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="528"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="525"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="540"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="564"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="561"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="576"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="619"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="616"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="661"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="689"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="686"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> @@ -6287,7 +6312,7 @@ Please export this template to a different file.</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1274"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1273"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6300,79 +6325,79 @@ Please export this template to a different file.</source> <translation>Ожидание местоположения GPS</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="783"/> - <location filename="../core/qthelper.cpp" line="1344"/> + <location filename="../core/qthelper.cpp" line="778"/> + <location filename="../core/qthelper.cpp" line="1339"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="785"/> - <location filename="../core/qthelper.cpp" line="1343"/> + <location filename="../core/qthelper.cpp" line="780"/> + <location filename="../core/qthelper.cpp" line="1338"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="811"/> + <location filename="../core/qthelper.cpp" line="806"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="813"/> + <location filename="../core/qthelper.cpp" line="808"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="838"/> - <location filename="../core/qthelper.cpp" line="1319"/> + <location filename="../core/qthelper.cpp" line="833"/> + <location filename="../core/qthelper.cpp" line="1314"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="840"/> - <location filename="../core/qthelper.cpp" line="1320"/> + <location filename="../core/qthelper.cpp" line="835"/> + <location filename="../core/qthelper.cpp" line="1315"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="865"/> - <location filename="../core/qthelper.cpp" line="1369"/> + <location filename="../core/qthelper.cpp" line="860"/> + <location filename="../core/qthelper.cpp" line="1364"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="867"/> - <location filename="../core/qthelper.cpp" line="1368"/> + <location filename="../core/qthelper.cpp" line="862"/> + <location filename="../core/qthelper.cpp" line="1363"/> <source>psi</source> <translation>psi</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="888"/> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="883"/> + <location filename="../core/qthelper.cpp" line="1299"/> <source>AIR</source> <translation>воздух</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="890"/> + <location filename="../core/qthelper.cpp" line="885"/> <source>EAN</source> <translation>EAN</translation> </message> <message numerus="yes"> - <location filename="../core/qthelper.cpp" line="1028"/> + <location filename="../core/qthelper.cpp" line="1023"/> <source>(%n dive(s))</source> <translation><numerusform>(%n дайв)</numerusform><numerusform>(%n дайва)</numerusform><numerusform>(%n дайвов)</numerusform><numerusform>(%n dive(s))</numerusform></translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1304"/> + <location filename="../core/qthelper.cpp" line="1299"/> <source>OXYGEN</source> <translation>КИСЛОРОД</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1391"/> + <location filename="../core/qthelper.cpp" line="1386"/> <source>l</source> <translation>л</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="1392"/> + <location filename="../core/qthelper.cpp" line="1387"/> <source>cuft</source> <translation>куб. фут</translation> </message> @@ -6426,32 +6451,32 @@ Please export this template to a different file.</source> <translation>Максимум</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="638"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="626"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="646"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="634"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="692"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="680"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="699"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> <message> - <location filename="../core/divesite.cpp" line="20"/> + <location filename="../core/divesite-helper.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"/> + <location filename="../core/divesite-helper.cpp" line="28"/> <source>Tags</source> <translation>Метки</translation> </message> @@ -6722,38 +6747,38 @@ Not all images have timestamps in the range between <translation>Какое время и дата отображены на изображении?</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="311"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="309"/> <source>Open image file</source> <translation>Открыть файл с изображением</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="313"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="311"/> <source>Image files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="388"/> <source>Selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="390"/> <source>First selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="394"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="391"/> <source>Last selected dive date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="396"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="393"/> <source> Files with inappropriate date/time</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="406"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="403"/> <source>No Exif date/time found</source> <translation type="unfinished"/> </message> @@ -7071,47 +7096,47 @@ Files with inappropriate date/time</source> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="410"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> <source>Enter User ID and click Download</source> <translation>Укажите КЛЮЧ и нажмите Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="432"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="420"/> <source>Webservice</source> <translation>Вебсервис</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="518"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="506"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="537"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="525"/> <source>Download finished</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="551"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="539"/> <source>Download error: %1</source> <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="561"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> <source>Connection error: </source> <translation>Ошибка соединения:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="564"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> <source>Invalid user identifier!</source> <translation>Неверный идентификатор пользователя!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="567"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> <source>Cannot parse response!</source> <translation>Невозможно разобрать ответ!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="570"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="558"/> <source>Download successful</source> <translation>Загрузка завершена</translation> </message> @@ -7119,7 +7144,7 @@ Files with inappropriate date/time</source> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="585"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -7127,7 +7152,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="159"/> + <location filename="../qt-models/filtermodels.cpp" line="168"/> <source>No suit set</source> <translation>Костюм не указан</translation> </message> @@ -7253,32 +7278,37 @@ Files with inappropriate date/time</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="47"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.ui" line="29"/> + <source>Zoom level</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="48"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="52"/> <source>Load image(s) from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="50"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="54"/> <source>Delete selected images</source> <translation>Удалить выбранные изображения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="51"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="55"/> <source>Delete all images</source> <translation>Удалить все изображения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> <source>Deleting Images</source> <translation>Удаление изображений</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="90"/> + <location filename="../desktop-widgets/tab-widgets/TabDivePhotos.cpp" line="94"/> <source>Are you sure you want to delete all images?</source> <translation>Удалить все изображения?</translation> </message> @@ -7448,7 +7478,7 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="506"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="535"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -7456,7 +7486,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="179"/> + <location filename="../qt-models/filtermodels.cpp" line="193"/> <source>Empty tags</source> <translation>Без меток</translation> </message> @@ -7655,7 +7685,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="675"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -8108,12 +8138,12 @@ Language: %1</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="339"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="360"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -8264,7 +8294,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="792"/> + <location filename="../core/libdivecomputer.c" line="795"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -8282,14 +8312,14 @@ Maximum</source> <message> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/file.c" line="771"/> + <location filename="../core/file.c" line="770"/> <location filename="../core/libdivecomputer.c" line="255"/> <source>ascent</source> <translation>подъем</translation> </message> <message> <location filename="../core/cochran.c" line="337"/> - <location filename="../core/file.c" line="749"/> + <location filename="../core/file.c" line="748"/> <source>battery</source> <translation>батарея</translation> </message> @@ -8316,7 +8346,7 @@ Maximum</source> <location filename="../core/cochran.c" line="360"/> <location filename="../core/cochran.c" line="409"/> <location filename="../core/cochran.c" line="416"/> - <location filename="../core/file.c" line="852"/> + <location filename="../core/file.c" line="851"/> <location filename="../core/libdivecomputer.c" line="263"/> <location filename="../core/libdivecomputer.c" line="277"/> <source>gaschange</source> @@ -8617,13 +8647,13 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="270"/> - <location filename="../core/qthelper.cpp" line="667"/> + <location filename="../core/qthelper.cpp" line="662"/> <source>bar</source> <translation>бар</translation> </message> <message> <location filename="../core/dive.c" line="274"/> - <location filename="../core/qthelper.cpp" line="670"/> + <location filename="../core/qthelper.cpp" line="665"/> <source>psi</source> <translation>psi</translation> </message> @@ -8639,15 +8669,15 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="357"/> - <location filename="../core/qthelper.cpp" line="588"/> - <location filename="../core/qthelper.cpp" line="603"/> + <location filename="../core/qthelper.cpp" line="583"/> + <location filename="../core/qthelper.cpp" line="598"/> <source>m</source> <translation>м</translation> </message> <message> <location filename="../core/dive.c" line="362"/> - <location filename="../core/qthelper.cpp" line="591"/> - <location filename="../core/qthelper.cpp" line="605"/> + <location filename="../core/qthelper.cpp" line="586"/> + <location filename="../core/qthelper.cpp" line="600"/> <source>ft</source> <translation>фут</translation> </message> @@ -8673,15 +8703,15 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="413"/> - <location filename="../core/qthelper.cpp" line="614"/> - <location filename="../core/qthelper.cpp" line="624"/> + <location filename="../core/qthelper.cpp" line="609"/> + <location filename="../core/qthelper.cpp" line="619"/> <source>lbs</source> <translation>фунт</translation> </message> <message> <location filename="../core/dive.c" line="417"/> - <location filename="../core/qthelper.cpp" line="612"/> - <location filename="../core/qthelper.cpp" line="622"/> + <location filename="../core/qthelper.cpp" line="607"/> + <location filename="../core/qthelper.cpp" line="617"/> <source>kg</source> <translation>кг</translation> </message> @@ -8730,11 +8760,11 @@ Maximum</source> </message> <message> <location filename="../core/file.c" line="122"/> - <location filename="../core/file.c" line="505"/> - <location filename="../core/file.c" line="591"/> - <location filename="../core/file.c" line="889"/> - <location filename="../core/file.c" line="1099"/> - <location filename="../core/ostctools.c" line="52"/> + <location filename="../core/file.c" line="504"/> + <location filename="../core/file.c" line="590"/> + <location filename="../core/file.c" line="888"/> + <location filename="../core/file.c" line="1098"/> + <location filename="../core/ostctools.c" line="49"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> @@ -8745,53 +8775,53 @@ Maximum</source> <translation>Невозможно открыть CSV-файл %s; воспользуйтесь функцией Импорт</translation> </message> <message> - <location filename="../core/file.c" line="507"/> + <location filename="../core/file.c" line="506"/> <source>Empty file '%s'</source> <translation>Пустой файл '%s'</translation> </message> <message> - <location filename="../core/file.c" line="688"/> + <location filename="../core/file.c" line="687"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Импорт из Poseidon не удался: невозможно прочесть '%s'</translation> </message> <message> - <location filename="../core/file.c" line="724"/> + <location filename="../core/file.c" line="723"/> <source>Mouth piece position OC</source> <translation>Режим загубника ОЦ</translation> </message> <message> - <location filename="../core/file.c" line="728"/> + <location filename="../core/file.c" line="727"/> <source>Mouth piece position CC</source> <translation>Режим загубника ЗЦ</translation> </message> <message> - <location filename="../core/file.c" line="732"/> + <location filename="../core/file.c" line="731"/> <source>Mouth piece position unknown</source> <translation>Режим загубника неизвестен</translation> </message> <message> - <location filename="../core/file.c" line="736"/> + <location filename="../core/file.c" line="735"/> <source>Mouth piece position not connected</source> <translation>Переключатель загубника не подключен</translation> </message> <message> - <location filename="../core/file.c" line="743"/> + <location filename="../core/file.c" line="742"/> <source>Power off</source> <translation>Выключение</translation> </message> <message> - <location filename="../core/file.c" line="793"/> + <location filename="../core/file.c" line="792"/> <source>O₂ calibration failed</source> <translation>Калибровка O₂ не удалась</translation> </message> <message> - <location filename="../core/file.c" line="795"/> - <location filename="../core/file.c" line="804"/> + <location filename="../core/file.c" line="794"/> + <location filename="../core/file.c" line="803"/> <source>O₂ calibration</source> <translation>Калибровка O₂</translation> </message> <message> - <location filename="../core/file.c" line="950"/> + <location filename="../core/file.c" line="949"/> <source>No dive profile found from '%s'</source> <translation type="unfinished"/> </message> @@ -8897,22 +8927,22 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="616"/> + <location filename="../core/git-access.c" line="618"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="757"/> + <location filename="../core/git-access.c" line="759"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="760"/> + <location filename="../core/git-access.c" line="762"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="783"/> + <location filename="../core/git-access.c" line="785"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> @@ -9055,74 +9085,74 @@ Maximum</source> <translation>Ошибка при получении режима погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="746"/> + <location filename="../core/libdivecomputer.c" line="749"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="772"/> + <location filename="../core/libdivecomputer.c" line="775"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="778"/> + <location filename="../core/libdivecomputer.c" line="781"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="799"/> + <location filename="../core/libdivecomputer.c" line="802"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="806"/> + <location filename="../core/libdivecomputer.c" line="809"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="940"/> + <location filename="../core/libdivecomputer.c" line="943"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="959"/> + <location filename="../core/libdivecomputer.c" line="962"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1021"/> + <location filename="../core/libdivecomputer.c" line="1024"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1026"/> + <location filename="../core/libdivecomputer.c" line="1029"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1047"/> + <location filename="../core/libdivecomputer.c" line="1050"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1086"/> + <location filename="../core/libdivecomputer.c" line="1089"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1095"/> + <location filename="../core/libdivecomputer.c" line="1098"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1120"/> + <location filename="../core/libdivecomputer.c" line="1123"/> <source>Error opening the device %s %s (%s). In most cases, in order to debug this issue, a libdivecomputer logfile will be useful. You can create this logfile by selecting the corresponding checkbox in the download dialog.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1129"/> + <location filename="../core/libdivecomputer.c" line="1132"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> @@ -9136,30 +9166,30 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/load-git.c" line="225"/> - <location filename="../core/parse.c" line="495"/> + <location filename="../core/parse.c" line="493"/> <source>additional name for site: %s </source> <translation>другое название дайв-сайта: %s </translation> </message> <message> - <location filename="../core/load-git.c" line="1707"/> + <location filename="../core/load-git.c" line="1719"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1711"/> + <location filename="../core/load-git.c" line="1723"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/ostctools.c" line="93"/> - <location filename="../core/ostctools.c" line="125"/> + <location filename="../core/ostctools.c" line="109"/> + <location filename="../core/ostctools.c" line="141"/> <source>Unknown DC in dive %d</source> <translation>Неизвестный дайв-компьютер в погружении %d</translation> </message> <message> - <location filename="../core/ostctools.c" line="138"/> + <location filename="../core/ostctools.c" line="154"/> <source>Error - %s - parsing dive %d</source> <translation>Ошибка %s в погружении %d</translation> </message> @@ -9441,7 +9471,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>ean</translation> </message> <message> - <location filename="../core/profile.c" line="1375"/> + <location filename="../core/profile.c" line="1379"/> <source>@: %d:%02d D: %.1f%s </source> @@ -9450,257 +9480,257 @@ D: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1387"/> + <location filename="../core/profile.c" line="1391"/> <source>T: %.1f%s </source> <translation>Т: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1393"/> + <location filename="../core/profile.c" line="1397"/> <source>V: %.1f%s </source> <translation>С: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1396"/> + <location filename="../core/profile.c" line="1400"/> <source>SAC: %.*f%s/min </source> <translation>SAC: %.*f%s/мин </translation> </message> <message> - <location filename="../core/profile.c" line="1398"/> + <location filename="../core/profile.c" line="1402"/> <source>CNS: %u%% </source> <translation>CNS: %u%% </translation> </message> <message> - <location filename="../core/profile.c" line="1400"/> + <location filename="../core/profile.c" line="1404"/> <source>pO%s: %.2fbar </source> <translation>pO%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1402"/> + <location filename="../core/profile.c" line="1406"/> <source>pN%s: %.2fbar </source> <translation>pN%s: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1404"/> + <location filename="../core/profile.c" line="1408"/> <source>pHe: %.2fbar </source> <translation>pHe: %.2fбар </translation> </message> <message> - <location filename="../core/profile.c" line="1407"/> + <location filename="../core/profile.c" line="1411"/> <source>MOD: %d%s </source> <translation>MOD: %d%s </translation> </message> <message> - <location filename="../core/profile.c" line="1447"/> + <location filename="../core/profile.c" line="1451"/> <source>Deco: %umin @ %.0f%s </source> <translation>Деко: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1439"/> + <location filename="../core/profile.c" line="1443"/> <source>Safety stop: %umin @ %.0f%s </source> <translation>Ост. без-ти: %uмин @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1383"/> + <location filename="../core/profile.c" line="1387"/> <source>P: %d%s (%s) </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1416"/> + <location filename="../core/profile.c" line="1420"/> <source>EAD: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1422"/> + <location filename="../core/profile.c" line="1426"/> <source>END: %d%s EADD: %d%s / %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1427"/> + <location filename="../core/profile.c" line="1431"/> <source>Density: %.1fg/ℓ </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/profile.c" line="1442"/> + <location filename="../core/profile.c" line="1446"/> <source>Safety stop: unknown time @ %.0f%s </source> <translation>Ост. без-ти: неизв. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1450"/> + <location filename="../core/profile.c" line="1454"/> <source>Deco: unknown time @ %.0f%s </source> <translation>Деко: неиз. время @ %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1454"/> + <location filename="../core/profile.c" line="1458"/> <source>In deco </source> <translation>В деко </translation> </message> <message> - <location filename="../core/profile.c" line="1456"/> + <location filename="../core/profile.c" line="1460"/> <source>NDL: %umin </source> <translation>NDL: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1459"/> + <location filename="../core/profile.c" line="1463"/> <source>TTS: %umin </source> <translation>TTS: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1462"/> + <location filename="../core/profile.c" line="1466"/> <source>Deco: %umin @ %.0f%s (calc) </source> <translation>Деко: %uмин @ %.0f%s (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1470"/> + <location filename="../core/profile.c" line="1474"/> <source>In deco (calc) </source> <translation>В деко (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1473"/> + <location filename="../core/profile.c" line="1477"/> <source>NDL: %umin (calc) </source> <translation>NDL: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1475"/> + <location filename="../core/profile.c" line="1479"/> <source>NDL: >2h (calc) </source> <translation>NDL: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1479"/> + <location filename="../core/profile.c" line="1483"/> <source>TTS: %umin (calc) </source> <translation>TTS: %uмин (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1481"/> + <location filename="../core/profile.c" line="1485"/> <source>TTS: >2h (calc) </source> <translation>TTS: >2ч (вычисл.) </translation> </message> <message> - <location filename="../core/profile.c" line="1484"/> + <location filename="../core/profile.c" line="1488"/> <source>RBT: %umin </source> <translation>RBT: %uмин </translation> </message> <message> - <location filename="../core/profile.c" line="1487"/> + <location filename="../core/profile.c" line="1491"/> <source>Calculated ceiling %.0f%s </source> <translation>Расчетный потолок %.0f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1493"/> + <location filename="../core/profile.c" line="1497"/> <source>Tissue %.0fmin: %.1f%s </source> <translation>Ткань %.0fмин: %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1499"/> + <location filename="../core/profile.c" line="1503"/> <source>heart rate: %d </source> <translation>пульс: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1501"/> + <location filename="../core/profile.c" line="1505"/> <source>bearing: %d </source> <translation>азимут: %d </translation> </message> <message> - <location filename="../core/profile.c" line="1504"/> + <location filename="../core/profile.c" line="1508"/> <source>mean depth to here %.1f%s </source> <translation>средная глубина здесь %.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1601"/> + <location filename="../core/profile.c" line="1605"/> <source>%sT: %d:%02d min</source> <translation>%sT: %d:%02d min</translation> </message> <message> - <location filename="../core/profile.c" line="1605"/> <location filename="../core/profile.c" line="1609"/> <location filename="../core/profile.c" line="1613"/> + <location filename="../core/profile.c" line="1617"/> <source>%s %sD:%.1f%s</source> <translation>%s %sГ:%.1f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1617"/> + <location filename="../core/profile.c" line="1621"/> <source>%s %sD:%.1f%s </source> <translation>%s %sГ:%.1f%s </translation> </message> <message> - <location filename="../core/profile.c" line="1621"/> + <location filename="../core/profile.c" line="1625"/> <source>%s%sV:%.2f%s</source> <translation>%s%sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1625"/> <location filename="../core/profile.c" line="1629"/> + <location filename="../core/profile.c" line="1633"/> <source>%s %sV:%.2f%s</source> <translation>%s %sС:%.2f%s</translation> </message> <message> - <location filename="../core/profile.c" line="1636"/> + <location filename="../core/profile.c" line="1640"/> <source>%s %sP:%d %s</source> <translation>%s %sД:%d %s</translation> </message> <message> - <location filename="../core/profile.c" line="1661"/> + <location filename="../core/profile.c" line="1665"/> <source>%s SAC: %.*f%s</source> <translation>%s SAC: %.*f%s</translation> </message> @@ -9749,17 +9779,17 @@ EADD: %d%s / %.1fg/ℓ <translation>З</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="633"/> + <location filename="../core/qthelper.cpp" line="628"/> <source>C</source> <translation>C</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="636"/> + <location filename="../core/qthelper.cpp" line="631"/> <source>F</source> <translation>F</translation> </message> <message> - <location filename="../core/qthelper.cpp" line="965"/> + <location filename="../core/qthelper.cpp" line="960"/> <source>more than %1 days</source> <translation type="unfinished"/> </message> @@ -10598,112 +10628,112 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="118"/> + <location filename="../mobile-widgets/qml/main.qml" line="119"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="134"/> + <location filename="../mobile-widgets/qml/main.qml" line="135"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="235"/> + <location filename="../mobile-widgets/qml/main.qml" line="239"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="251"/> + <location filename="../mobile-widgets/qml/main.qml" line="256"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="137"/> + <location filename="../mobile-widgets/qml/main.qml" line="138"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="147"/> + <location filename="../mobile-widgets/qml/main.qml" line="149"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="163"/> + <location filename="../mobile-widgets/qml/main.qml" line="166"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="182"/> + <location filename="../mobile-widgets/qml/main.qml" line="185"/> <source>Offline mode</source> <translation>Режим "Без Интернета"</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="182"/> - <source>Enable auto cloud sync</source> - <translation>Включить синхронизацию с облаком</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="187"/> + <location filename="../mobile-widgets/qml/main.qml" line="190"/> <source>Turning off automatic sync to cloud causes all data to only be stored locally. This can be very useful in situations with limited or no network access. Please choose 'Manual sync with cloud' if you have network connectivity and want to sync your data to cloud storage.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="196"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="277"/> + <location filename="../mobile-widgets/qml/main.qml" line="285"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="201"/> + <location filename="../mobile-widgets/qml/main.qml" line="204"/> <source>Upload GPS data</source> <translation>Выгрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="156"/> + <location filename="../mobile-widgets/qml/main.qml" line="159"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <source>Auto cloud sync enabled</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../mobile-widgets/qml/main.qml" line="212"/> <source>Download GPS data</source> <translation>Загрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="217"/> + <location filename="../mobile-widgets/qml/main.qml" line="220"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="227"/> + <location filename="../mobile-widgets/qml/main.qml" line="231"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="259"/> + <location filename="../mobile-widgets/qml/main.qml" line="265"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="262"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="269"/> + <location filename="../mobile-widgets/qml/main.qml" line="276"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="243"/> + <location filename="../mobile-widgets/qml/main.qml" line="247"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="235"/> + <location filename="../mobile-widgets/qml/main.qml" line="239"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> |