diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-23 22:07:52 +0900 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2018-06-23 22:07:52 +0900 |
| commit | 2eb7c2e23f97e88ee85d56f5a9945e7959423a88 (patch) | |
| tree | bf931f30d1f04b3b47c324ae7fcd416c19aa3640 /translations/subsurface_ru_RU.ts | |
| parent | 67d8f31d94c159390b8871ce17c93693bbdd4fe5 (diff) | |
| download | subsurface-2eb7c2e23f97e88ee85d56f5a9945e7959423a88.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 | 528 |
1 files changed, 262 insertions, 266 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index 8c398e6bb..d7a769479 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -325,12 +325,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="550"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> <source>Searches for buddies and divemasters</source> <translation>Поиск партнеров и инструкторов</translation> </message> @@ -1932,12 +1932,12 @@ <translation>Редактировать дайвкомпьютеры</translation> </message> <message> - <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="42"/> <source>Remove the selected dive computer?</source> <translation>Удалить компьютер?</translation> </message> <message> - <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divecomputermanagementdialog.cpp" line="43"/> <source>Are you sure that you want to remove the selected dive computer?</source> <translation>Вы действительно хотите удалить @@ -1947,22 +1947,22 @@ <context> <name>DiveComputerModel</name> <message> - <location filename="../qt-models/divecomputermodel.cpp" line="8"/> + <location filename="../qt-models/divecomputermodel.cpp" line="9"/> <source>Model</source> <translation>Модель</translation> </message> <message> - <location filename="../qt-models/divecomputermodel.cpp" line="8"/> + <location filename="../qt-models/divecomputermodel.cpp" line="9"/> <source>Device ID</source> <translation>Идентификатор</translation> </message> <message> - <location filename="../qt-models/divecomputermodel.cpp" line="8"/> + <location filename="../qt-models/divecomputermodel.cpp" line="9"/> <source>Nickname</source> <translation>Название</translation> </message> <message> - <location filename="../qt-models/divecomputermodel.cpp" line="42"/> + <location filename="../qt-models/divecomputermodel.cpp" line="36"/> <source>Clicking here will remove this dive computer.</source> <translation>Нажмите здесь чтобы удалить этот дайвкомпьютер.</translation> </message> @@ -2098,27 +2098,27 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="235"/> + <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="241"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="247"/> + <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="291"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="253"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> @@ -2138,27 +2138,27 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="351"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="305"/> + <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="387"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -3041,62 +3041,62 @@ GPS location:</source> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="163"/> + <location filename="../qt-models/diveplannermodel.cpp" line="164"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="264"/> + <location filename="../qt-models/diveplannermodel.cpp" line="265"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="368"/> + <location filename="../qt-models/diveplannermodel.cpp" line="369"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="370"/> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="372"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="374"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="376"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="378"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>Dive mode</source> <translation>Режим</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1025"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1031"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1034"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1081"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3104,32 +3104,32 @@ GPS location:</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="113"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="114"/> <source>Dive planner points</source> <translation>Путевые точки плана</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="118"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="119"/> <source>Available gases</source> <translation>Доступные смеси</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="119"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="120"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="150"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="151"/> <source>Add dive data point</source> <translation>Добавить путевую точку</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="160"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="161"/> <source>Save new</source> <translation>Сохранить новый</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="265"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="266"/> <source>kg/ℓ</source> <translation>кг/л</translation> </message> @@ -3696,9 +3696,9 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="185"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="269"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3724,7 +3724,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="198"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3744,52 +3744,52 @@ p, li { white-space: pre-wrap; } <translation>Производитель : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="87"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="88"/> <source> Dive Computer:</source> <translation>Дайв-компьютер:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="121"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="123"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="187"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="189"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="198"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="200"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="212"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="214"/> <source>Rescan</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="220"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="222"/> <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="223"/> <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="263"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="280"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="282"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="288"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="290"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3864,17 +3864,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="520"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="525"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="521"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="526"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="527"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3949,7 +3949,7 @@ p, li { white-space: pre-wrap; } <context> <name>GasSelectionModel</name> <message> - <location filename="../qt-models/models.cpp" line="51"/> + <location filename="../qt-models/models.cpp" line="52"/> <source>cyl.</source> <translation type="unfinished"/> </message> @@ -4014,7 +4014,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -4180,8 +4180,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="534"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="535"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="574"/> <source>Notes</source> <translation>Основное</translation> </message> @@ -4202,19 +4202,19 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="107"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="307"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="117"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="308"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="309"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> <location filename="../desktop-widgets/tab-widgets/maintab.ui" line="192"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="572"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="573"/> <source>Location</source> <translation>Местонахождение</translation> </message> @@ -4279,103 +4279,103 @@ p, li { white-space: pre-wrap; } <translation>Длительность</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="61"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="62"/> <source>Extra Info</source> <translation>Дополнительно</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="55"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="56"/> <source>Information</source> <translation>Информация</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="57"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="58"/> <source>Statistics</source> <translation>Статистика</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="59"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="60"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="83"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="84"/> <source>Apply changes</source> <translation>Применить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="87"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="88"/> <source>Discard changes</source> <translation>Отменить изменения</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="103"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> <source>Cylinders</source> <translation>Баллоны</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="104"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="105"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="107"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> <source>Weights</source> <translation>Грузы</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="108"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="109"/> <source>Add weight system</source> <translation>Добавить грузовую систему</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="304"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> <source>Air temp. [%1]</source> <translation>Темп. воздуха [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="305"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="306"/> <source>Water temp. [%1]</source> <translation>Темп. воды [%1]</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="345"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="346"/> <source>This trip is being edited.</source> <translation>Редактирование поездки.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="352"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="353"/> <source>Multiple dives are being edited.</source> <translation>Множественное редактирование.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="354"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="355"/> <source>This dive is being edited.</source> <translation>Редактирование погружения.</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="482"/> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="522"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="483"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="523"/> <source>Trip notes</source> <translation>Поездка</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="517"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="518"/> <source>Trip location</source> <translation>Местоположение</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="738"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="739"/> <source>New dive site</source> <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1034"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1035"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1036"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4789,7 +4789,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/mainwindow.cpp" line="564"/> <location filename="../desktop-widgets/mainwindow.cpp" line="609"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1651"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1650"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> @@ -4801,7 +4801,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/mainwindow.cpp" line="574"/> <location filename="../desktop-widgets/mainwindow.cpp" line="719"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2046"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -4824,9 +4824,9 @@ p, li { white-space: pre-wrap; } <location filename="../desktop-widgets/divelistview.cpp" line="583"/> <location filename="../desktop-widgets/mainwindow.cpp" line="673"/> <location filename="../desktop-widgets/mainwindow.cpp" line="752"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="906"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1024"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1907"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4876,192 +4876,192 @@ If answering no, the cloud will only be synced on next call to "Open cloud <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="907"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="906"/> <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="967"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="966"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1025"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1024"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1908"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1907"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1149"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1148"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1378"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1420"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1377"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1440"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <source>Subsurface files</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1441"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1680"/> - <source>Subsurface files</source> + <source>Cochran</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> - <source>Cochran</source> + <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <source>DiveLogs.de</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1444"/> - <source>DiveLogs.de</source> + <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1445"/> - <source>JDiveLog</source> + <source>Liquivision</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1446"/> - <source>Liquivision</source> + <source>Suunto</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1447"/> - <source>Suunto</source> + <source>UDCF</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1448"/> - <source>UDCF</source> - <translation type="unfinished"/> + <source>UDDF</source> + <translation>UDDF</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1449"/> - <source>UDDF</source> - <translation>UDDF</translation> + <source>XML</source> + <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1406"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1450"/> - <source>XML</source> + <source>Divesoft</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1407"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1451"/> - <source>Divesoft</source> + <source>Datatrak/WLog</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1408"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1452"/> - <source>Datatrak/WLog</source> + <source>MkVI files</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1409"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1453"/> - <source>MkVI files</source> + <source>APD log viewer</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1410"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1454"/> - <source>APD log viewer</source> + <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.cpp" line="1411"/> <location filename="../desktop-widgets/mainwindow.cpp" line="1455"/> - <source>OSTCtools</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1412"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1443"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1442"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1457"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1456"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1468"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1467"/> <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="1471"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1470"/> <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="685"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1475"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1477"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1476"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1678"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1767"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1766"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1769"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1768"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1860"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1861"/> <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="1873"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1872"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2047"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2046"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5078,7 +5078,6 @@ Subsurface попытался перенести уже существующие <name>MapWidget</name> <message> <location filename="../map-widget/qml/MapWidget.qml" line="255"/> - <location filename="../map-widget/qml/MapWidget.qml" line="255"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5087,25 +5086,21 @@ Subsurface попытался перенести уже существующие <name>MapWidgetContextMenu</name> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="15"/> <source>Open in Google Maps</source> <translation type="unfinished"/> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="16"/> <source>Copy coordinates to clipboard (decimal)</source> <translation type="unfinished"/> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="17"/> <source>Copy coordinates to clipboard (sexagesimal)</source> <translation type="unfinished"/> </message> <message> <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> - <location filename="../map-widget/qml/MapWidgetContextMenu.qml" line="18"/> <source>Select visible dive locations</source> <translation type="unfinished"/> </message> @@ -5122,7 +5117,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="595"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="600"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> @@ -5196,74 +5191,74 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="542"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="543"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="543"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="544"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="544"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="545"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="545"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="546"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="546"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="547"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="548"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="549"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="549"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="550"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="550"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="551"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="551"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="552"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="552"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="553"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="555"/> <location filename="../desktop-widgets/diveplanner.cpp" line="556"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="557"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="564"/> <location filename="../desktop-widgets/diveplanner.cpp" line="565"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="566"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="574"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="575"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="579"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="580"/> <source>psi</source> <translation>psi</translation> </message> @@ -6141,128 +6136,128 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="789"/> + <location filename="../profile-widget/profilewidget2.cpp" line="790"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="785"/> + <location filename="../profile-widget/profilewidget2.cpp" line="786"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="813"/> + <location filename="../profile-widget/profilewidget2.cpp" line="814"/> <source>Show NDL / TTS was disabled because of excessive processing time</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1415"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="781"/> + <location filename="../profile-widget/profilewidget2.cpp" line="782"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="783"/> + <location filename="../profile-widget/profilewidget2.cpp" line="784"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1403"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1418"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1419"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1424"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1427"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1436"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1437"/> <source>Change divemode</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1460"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1461"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1465"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1469"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1476"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1477"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1507"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1514"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1508"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1515"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1529"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1530"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1564"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1564"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1565"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1599"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1600"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1601"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1737"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1738"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1739"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1743"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1744"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6270,146 +6265,146 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="177"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="182"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="236"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="239"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="244"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="271"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="276"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="354"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="359"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="358"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="367"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="372"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="368"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="447"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="373"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="458"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="409"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="414"/> <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="415"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="420"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="471"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="482"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="493"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="508"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="505"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="516"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="522"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="538"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="549"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="552"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="563"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="566"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="577"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="579"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="590"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="603"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="614"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="613"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="624"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="653"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="670"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="698"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="716"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="723"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="741"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="901"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="902"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="919"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="920"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="900"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="918"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1315"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1328"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6536,7 +6531,7 @@ Please export this template to a different file.</source> <translation>с</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="64"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="65"/> <source>Remove this point</source> <translation>Удалить эту точку</translation> </message> @@ -6723,71 +6718,71 @@ Please export this template to a different file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="54"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="53"/> <source>Change</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="61"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="60"/> <source>Status</source> <translation>Состояние</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="86"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="85"/> <source>Theme</source> <translation>Тема</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="94"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="93"/> <source>Blue</source> <translation>Синий</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="109"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="161"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="214"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="108"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="160"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="213"/> <source>regular text</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="124"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="176"/> - <location filename="../mobile-widgets/qml/Settings.qml" line="229"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="123"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="175"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="228"/> <source>Highlight</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="147"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="146"/> <source>Pink</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="199"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="198"/> <source>Dark</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="263"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="262"/> <source>Subsurface GPS data webservice</source> <translation>Веб-сервис GPS Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="272"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="271"/> <source>Distance threshold (meters)</source> <translation>Пороговое расстояние (метры)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="288"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="287"/> <source>Time threshold (minutes)</source> <translation>Пороговое время (минуты)</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="315"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="314"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/Settings.qml" line="324"/> + <location filename="../mobile-widgets/qml/Settings.qml" line="323"/> <source>Display Developer menu</source> <translation type="unfinished"/> </message> @@ -7251,7 +7246,7 @@ Files with inappropriate date/time</source> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="556"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="561"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -7590,7 +7585,7 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="545"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -7797,7 +7792,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="680"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="685"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -8756,8 +8751,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="36"/> <location filename="../core/equipment.c" line="91"/> + <location filename="../core/planner.c" line="1163"/> <location filename="../core/planner.c" line="1166"/> - <location filename="../core/planner.c" line="1169"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8852,8 +8847,8 @@ Maximum</source> <message> <location filename="../core/divelist.c" line="683"/> <location filename="../core/equipment.c" line="87"/> + <location filename="../core/planner.c" line="1159"/> <location filename="../core/planner.c" line="1162"/> - <location filename="../core/planner.c" line="1165"/> <source>air</source> <translation>воздух</translation> </message> @@ -9269,24 +9264,30 @@ Maximum</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1386"/> + <location filename="../core/libdivecomputer.c" line="1369"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1395"/> + <location filename="../core/libdivecomputer.c" line="1378"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1405"/> + <location filename="../core/libdivecomputer.c" line="1389"/> + <source>Error opening the device %s %s (%s). +In most cases, in order to debug this issue, it is useful to send the developers the log files. You can copy them to the clipboard in the About dialog.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/libdivecomputer.c" line="1391"/> <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="1416"/> + <location filename="../core/libdivecomputer.c" line="1403"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> @@ -9371,7 +9372,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="327"/> + <location filename="../core/planner.c" line="324"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="209"/> <source>SP change</source> <translation>изменение SP</translation> @@ -9634,12 +9635,12 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="898"/> + <location filename="../core/planner.c" line="895"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1170"/> + <location filename="../core/planner.c" line="1167"/> <source>ean</source> <translation>ean</translation> </message> @@ -10725,7 +10726,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1627"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1628"/> <source>modechange</source> <translation type="unfinished"/> </message> @@ -10733,122 +10734,117 @@ Is the Uemis Zurich plugged in correctly?</source> <context> <name>main</name> <message> - <location filename="../mobile-widgets/qml/main.qml" line="14"/> + <location filename="../mobile-widgets/qml/main.qml" line="15"/> <source>Subsurface-mobile</source> <translation>Мобильный Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="109"/> - <source>Subsurface</source> - <translation>Subsurface</translation> - </message> - <message> - <location filename="../mobile-widgets/qml/main.qml" line="120"/> + <location filename="../mobile-widgets/qml/main.qml" line="186"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="147"/> + <location filename="../mobile-widgets/qml/main.qml" line="213"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <location filename="../mobile-widgets/qml/main.qml" line="275"/> <source>Disable auto cloud sync</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="209"/> + <location filename="../mobile-widgets/qml/main.qml" line="275"/> <source>Enable auto cloud sync</source> <translation>Включить синхронизацию с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="278"/> + <location filename="../mobile-widgets/qml/main.qml" line="344"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="300"/> + <location filename="../mobile-widgets/qml/main.qml" line="366"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="152"/> + <location filename="../mobile-widgets/qml/main.qml" line="218"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="166"/> + <location filename="../mobile-widgets/qml/main.qml" line="232"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="187"/> + <location filename="../mobile-widgets/qml/main.qml" line="253"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="214"/> + <location filename="../mobile-widgets/qml/main.qml" line="280"/> <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="225"/> + <location filename="../mobile-widgets/qml/main.qml" line="291"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="333"/> + <location filename="../mobile-widgets/qml/main.qml" line="399"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="232"/> + <location filename="../mobile-widgets/qml/main.qml" line="298"/> <source>Upload GPS data</source> <translation>Выгрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="178"/> + <location filename="../mobile-widgets/qml/main.qml" line="244"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="243"/> + <location filename="../mobile-widgets/qml/main.qml" line="309"/> <source>Download GPS data</source> <translation>Загрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="254"/> + <location filename="../mobile-widgets/qml/main.qml" line="320"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="267"/> + <location filename="../mobile-widgets/qml/main.qml" line="333"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="311"/> + <location filename="../mobile-widgets/qml/main.qml" line="377"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="314"/> + <location filename="../mobile-widgets/qml/main.qml" line="380"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="322"/> + <location filename="../mobile-widgets/qml/main.qml" line="388"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="289"/> + <location filename="../mobile-widgets/qml/main.qml" line="355"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="278"/> + <location filename="../mobile-widgets/qml/main.qml" line="344"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> |