diff options
Diffstat (limited to 'translations/subsurface_ru_RU.ts')
| -rw-r--r-- | translations/subsurface_ru_RU.ts | 1616 |
1 files changed, 827 insertions, 789 deletions
diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index b25211ad2..7cdc594d2 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -24,11 +24,8 @@ <source>Version: %1 © Subsurface developer team -2011-2017</source> - <translation>Версия: %1 - -© Команда разработчиков Subsurface -2011-2017</translation> +2011-2018</source> + <translation type="unfinished"/> </message> </context> <context> @@ -323,12 +320,12 @@ <context> <name>BuddyFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="540"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="547"/> <source>Person: </source> <translation>Люди:</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="541"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="548"/> <source>Searches for buddies and divemasters</source> <translation>Поиск партнеров и инструкторов</translation> </message> @@ -408,172 +405,172 @@ <context> <name>ColumnNameProvider</name> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Cyl. size</source> <translation>Объем баллона</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> <source>Start pressure</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>End pressure</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Avg. depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Tags</source> <translation>Метки</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="47"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample time</source> <translation>Выборка времени</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample depth</source> <translation>Выборка глубины</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample temperature</source> <translation>Выборка температуры</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample pO₂</source> <translation>Выборка pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample CNS</source> <translation>Выборка CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="48"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> <source>Sample NDL</source> <translation>Выборка NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample TTS</source> <translation>Выборка TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample stopdepth</source> <translation>Выборка остановки</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="49"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> <source>Sample pressure</source> <translation>Выборка давления</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor1 pO₂</source> <translation>Выборка 1-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor2 pO₂</source> <translation>Выборка 2-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="50"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> <source>Sample sensor3 pO₂</source> <translation>Выборка 3-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="51"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="52"/> <source>Sample setpoint</source> <translation>Выборка установки</translation> </message> @@ -1947,12 +1944,12 @@ <context> <name>DiveDetails</name> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="46"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="44"/> <source>Dive details</source> <translation>Детали погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="140"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="138"/> <source>Delete dive</source> <translation>Удалить погружение</translation> </message> @@ -1962,7 +1959,7 @@ <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetails.qml" line="163"/> + <location filename="../mobile-widgets/qml/DiveDetails.qml" line="165"/> <source>Show on map</source> <translation>Показать на карте</translation> </message> @@ -1970,54 +1967,54 @@ <context> <name>DiveDetailsEdit</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="109"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="111"/> <source>Dive %1</source> <translation>Погружение %1</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="113"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="115"/> <source>Date:</source> <translation>Дата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="125"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="127"/> <source>Location:</source> <translation>Место:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="141"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="142"/> <source>Coordinates:</source> <translation>Координаты:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="154"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="155"/> <source>Use current GPS location:</source> <translation>Использовать текущее местоположение GPS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="169"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="170"/> <source>Depth:</source> <translation>Глубина:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="182"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="183"/> <source>Duration:</source> <translation>Длительность:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="196"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="197"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="209"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="210"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="223"/> <source>Suit:</source> <translation>Костюм:</translation> </message> @@ -2027,47 +2024,47 @@ GPS location:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="248"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="247"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="261"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="259"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="275"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="273"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="286"/> <source>Gas mix:</source> <translation>Смесь:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="302"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="300"/> <source>Start Pressure:</source> <translation>Нач. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="315"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="313"/> <source>End Pressure:</source> <translation>Кон. давление:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="328"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="326"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="341"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="339"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="355"/> + <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="353"/> <source>Notes:</source> <translation>Заметки:</translation> </message> @@ -2143,23 +2140,38 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="160"/> + <location filename="../profile-widget/diveeventitem.cpp" line="178"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="174"/> + <location filename="../profile-widget/diveeventitem.cpp" line="182"/> + <source>ICD</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="183"/> + <source>ΔHe</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="184"/> + <source>ΔN₂</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../profile-widget/diveeventitem.cpp" line="202"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="176"/> + <location filename="../profile-widget/diveeventitem.cpp" line="204"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="177"/> + <location filename="../profile-widget/diveeventitem.cpp" line="205"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -2197,23 +2209,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> <source>Cloud credentials</source> <translation>Учетные данные в облаке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> @@ -2324,12 +2336,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="391"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="392"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="393"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -2701,231 +2713,231 @@ GPS location:</source> <translation>Перетащите метки на соответствующие колонки ниже</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="360"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="533"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="361"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="534"/> <source>Tab</source> <translation>Tab</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="603"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="604"/> <source>Some column headers were pre-populated; please drag and drop the headers so they match the column they are in.</source> <translation>Перетаскивайте заголовки так, чтобы они соответствовали колонам с данными.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="641"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="759"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="874"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="642"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="760"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="875"/> <source>Sample time</source> <translation>Выборка времени</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="643"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="761"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="644"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="762"/> <source>Sample depth</source> <translation>Выборка глубины</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="645"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="763"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="646"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="764"/> <source>Sample temperature</source> <translation>Выборка температуры</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="647"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="765"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="648"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="766"/> <source>Sample pO₂</source> <translation>Выборка pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="649"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="767"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="650"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="768"/> <source>Sample sensor1 pO₂</source> <translation>Выборка 1-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="651"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="769"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="652"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="770"/> <source>Sample sensor2 pO₂</source> <translation>Выборка 2-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="653"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="771"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="654"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="772"/> <source>Sample sensor3 pO₂</source> <translation>Выборка 3-го сеносора pO₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="655"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="773"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="656"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="774"/> <source>Sample CNS</source> <translation>Выборка CNS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="657"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="775"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="658"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="776"/> <source>Sample NDL</source> <translation>Выборка NDL</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="659"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="777"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="660"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="778"/> <source>Sample TTS</source> <translation>Выборка TTS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="661"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="779"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="662"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="780"/> <source>Sample stopdepth</source> <translation>Выборка остановки</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="663"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="781"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="664"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="782"/> <source>Sample pressure</source> <translation>Выборка давления</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="665"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="783"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="666"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="784"/> <source>Sample setpoint</source> <translation>Выборка установки</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="669"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="757"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="878"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="758"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="879"/> <source>Dive #</source> <translation>№</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="670"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="751"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="880"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="752"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="881"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="671"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="755"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="882"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="756"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="883"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="672"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="884"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="885"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="673"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="890"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="891"/> <source>Max. depth</source> <translation>Макс. глубина</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="674"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="892"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="893"/> <source>Avg. depth</source> <translation>Сред. глубина</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="675"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="924"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="925"/> <source>Air temp.</source> <translation>Темп. воздуха</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="676"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="926"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="927"/> <source>Water temp.</source> <translation>Темп. воды</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="677"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="914"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="915"/> <source>Cyl. size</source> <translation>Объем баллона</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="678"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="916"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="917"/> <source>Start pressure</source> <translation>Нач. давл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="679"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="918"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="919"/> <source>End pressure</source> <translation>Кон. давл.</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="680"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="920"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="921"/> <source>O₂</source> <translation>O₂</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="681"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="922"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="923"/> <source>He</source> <translation>He</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="682"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="886"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="887"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="683"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="888"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="889"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="684"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="894"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="895"/> <source>Divemaster</source> <translation>Инструктор</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="685"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="896"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="897"/> <source>Buddy</source> <translation>Партнер</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="686"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="898"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="899"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="687"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="688"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> <source>Visibility</source> <translation>Видимость</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="689"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="900"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="901"/> <source>Notes</source> <translation>Примечания</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="690"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="902"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="903"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="691"/> - <location filename="../desktop-widgets/divelogimportdialog.cpp" line="904"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="692"/> + <location filename="../desktop-widgets/divelogimportdialog.cpp" line="905"/> <source>Tags</source> <translation>Метки</translation> </message> @@ -2937,11 +2949,6 @@ GPS location:</source> <source>(%n dive(s))</source> <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation> </message> - <message> - <location filename="../core/subsurface-qt/DiveObjectHelper.cpp" line="461"/> - <source>Multiple Buddies</source> - <translation>Несколько напарников</translation> - </message> </context> <context> <name>DivePlanner</name> @@ -2977,65 +2984,64 @@ GPS location:</source> </message> <message> <location filename="../desktop-widgets/diveplanner.ui" line="220"/> - <source> kg/ℓ</source> + <source>kg/ℓ</source> <translation>кг/л</translation> </message> </context> <context> <name>DivePlannerPointsModel</name> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="159"/> + <location filename="../qt-models/diveplannermodel.cpp" line="163"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="194"/> - <location filename="../qt-models/diveplannermodel.cpp" line="279"/> + <location filename="../qt-models/diveplannermodel.cpp" line="263"/> <source>cyl.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="375"/> + <location filename="../qt-models/diveplannermodel.cpp" line="359"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="377"/> + <location filename="../qt-models/diveplannermodel.cpp" line="361"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="379"/> + <location filename="../qt-models/diveplannermodel.cpp" line="363"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="381"/> + <location filename="../qt-models/diveplannermodel.cpp" line="365"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="383"/> + <location filename="../qt-models/diveplannermodel.cpp" line="367"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1024"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1008"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1030"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1014"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1033"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1017"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="1080"/> + <location filename="../qt-models/diveplannermodel.cpp" line="1064"/> <source>Stop times</source> <translation type="unfinished"/> </message> @@ -3043,27 +3049,27 @@ GPS location:</source> <context> <name>DivePlannerWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="112"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="113"/> <source>Dive planner points</source> <translation>Путевые точки плана</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="116"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="117"/> <source>Available gases</source> <translation>Доступные смеси</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="117"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="118"/> <source>Add cylinder</source> <translation>Добавить баллон</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="144"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="145"/> <source>Add dive data point</source> <translation>Добавить путевую точку</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="153"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="154"/> <source>Save new</source> <translation>Сохранить новый</translation> </message> @@ -3071,107 +3077,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="114"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="116"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="118"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="120"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="122"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="124"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="126"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="128"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="130"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="132"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="134"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="136"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="138"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="140"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="142"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="144"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="146"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="148"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Ambient pressure</source> <translation>Внешнее давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="150"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="152"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Gradient factor</source> <translation>Градиент-фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="154"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -3235,142 +3241,142 @@ p, li { white-space: pre-wrap; } <context> <name>DiveTripModel</name> <message> - <location filename="../qt-models/divetripmodel.cpp" line="478"/> - <location filename="../qt-models/divetripmodel.cpp" line="530"/> + <location filename="../qt-models/divetripmodel.cpp" line="477"/> + <location filename="../qt-models/divetripmodel.cpp" line="529"/> <source>#</source> <translation>№</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="481"/> - <location filename="../qt-models/divetripmodel.cpp" line="533"/> + <location filename="../qt-models/divetripmodel.cpp" line="480"/> + <location filename="../qt-models/divetripmodel.cpp" line="532"/> <source>Date</source> <translation>Дата</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="484"/> - <location filename="../qt-models/divetripmodel.cpp" line="536"/> + <location filename="../qt-models/divetripmodel.cpp" line="483"/> + <location filename="../qt-models/divetripmodel.cpp" line="535"/> <source>Rating</source> <translation>Оценка</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="487"/> + <location filename="../qt-models/divetripmodel.cpp" line="486"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="490"/> - <location filename="../qt-models/divetripmodel.cpp" line="542"/> + <location filename="../qt-models/divetripmodel.cpp" line="489"/> + <location filename="../qt-models/divetripmodel.cpp" line="541"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="496"/> + <location filename="../qt-models/divetripmodel.cpp" line="495"/> <source>Weight</source> <translation>Вес</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="499"/> - <location filename="../qt-models/divetripmodel.cpp" line="551"/> + <location filename="../qt-models/divetripmodel.cpp" line="498"/> + <location filename="../qt-models/divetripmodel.cpp" line="550"/> <source>Suit</source> <translation>Костюм</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="493"/> + <location filename="../qt-models/divetripmodel.cpp" line="492"/> <source>Temp.</source> <translation>Темп.</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="502"/> - <location filename="../qt-models/divetripmodel.cpp" line="554"/> + <location filename="../qt-models/divetripmodel.cpp" line="501"/> + <location filename="../qt-models/divetripmodel.cpp" line="553"/> <source>Cylinder</source> <translation>Баллон</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="505"/> - <location filename="../qt-models/divetripmodel.cpp" line="557"/> + <location filename="../qt-models/divetripmodel.cpp" line="504"/> + <location filename="../qt-models/divetripmodel.cpp" line="556"/> <source>Gas</source> <translation>Смесь</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="508"/> + <location filename="../qt-models/divetripmodel.cpp" line="507"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="511"/> - <location filename="../qt-models/divetripmodel.cpp" line="565"/> + <location filename="../qt-models/divetripmodel.cpp" line="510"/> + <location filename="../qt-models/divetripmodel.cpp" line="564"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="514"/> - <location filename="../qt-models/divetripmodel.cpp" line="568"/> + <location filename="../qt-models/divetripmodel.cpp" line="513"/> + <location filename="../qt-models/divetripmodel.cpp" line="567"/> <source>Max CNS</source> <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="517"/> + <location filename="../qt-models/divetripmodel.cpp" line="516"/> <source>Photos</source> <translation>Фотографии</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="520"/> + <location filename="../qt-models/divetripmodel.cpp" line="519"/> <source>Country</source> <translation>Страна</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="523"/> - <location filename="../qt-models/divetripmodel.cpp" line="574"/> + <location filename="../qt-models/divetripmodel.cpp" line="522"/> + <location filename="../qt-models/divetripmodel.cpp" line="573"/> <source>Location</source> <translation>Местонахождение</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>Depth(%1)</source> <translation>Глубина(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="539"/> + <location filename="../qt-models/divetripmodel.cpp" line="538"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="545"/> + <location filename="../qt-models/divetripmodel.cpp" line="544"/> <source>Temp.(%1%2)</source> <translation>Темп.(%1%2)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>Weight(%1)</source> <translation>Вес(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>kg</source> <translation>кг</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="548"/> + <location filename="../qt-models/divetripmodel.cpp" line="547"/> <source>lbs</source> <translation>фунт</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="562"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>SAC(%1)</source> <translation>SAC(%1)</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="562"/> + <location filename="../qt-models/divetripmodel.cpp" line="561"/> <source>/min</source> <translation>/мин</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="571"/> + <location filename="../qt-models/divetripmodel.cpp" line="570"/> <source>Photos before/during/after dive</source> <translation>Фото до/во время/после погружения</translation> </message> @@ -3378,112 +3384,112 @@ p, li { white-space: pre-wrap; } <context> <name>DivelogsDeWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="155"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="41"/> <source>no dives were selected</source> <translation>не выбраны погружения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="165"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="51"/> <source>stylesheet to export to divelogs.de is not found</source> <translation>Не найден стиль для экспорта в divelogs.de</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="175"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="61"/> <source>failed to create zip file for upload: %s</source> <translation>не удалось создать ZIP файл для загрузки: %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="239"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="125"/> <source>internal error</source> <translation>внутренняя ошибка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="247"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="133"/> <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="275"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="161"/> <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="745"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="936"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="631"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="822"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="779"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="665"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="811"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="697"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="852"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="738"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="886"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="772"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="900"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="786"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="901"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="787"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="910"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="796"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="911"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="797"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="937"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="836"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="953"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="839"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="956"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="842"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="959"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="845"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="857"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -3507,52 +3513,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="228"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="225"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="263"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="260"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="288"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="285"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="365"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="368"/> <source>Choose file for dive computer download logfile</source> <translation>Выберите файл для протокола загрузки из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="366"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="369"/> <source>Log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="391"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="394"/> <source>Choose file for dive computer binary dump file</source> <translation>Выберите файл для двоичного дампа из дайв-компьютера</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="392"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="395"/> <source>Dump files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="417"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="420"/> <source>Retry download</source> <translation>Повторить загрузку</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="379"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="382"/> <source>Warning</source> <translation>Предупреждение</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="380"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="383"/> <source>Saving the libdivecomputer dump will NOT download dives to the dive list.</source> <translation>При сохранении дампа, погружения в журнал НЕ загружаются.</translation> </message> @@ -3792,17 +3798,17 @@ p, li { white-space: pre-wrap; } <context> <name>FilterBase</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="515"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="522"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="516"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="523"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="517"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="524"/> <source>Invert Selection</source> <translation type="unfinished"/> </message> @@ -3826,8 +3832,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/listfilter.ui" line="57"/> - <source>...</source> - <translation>...</translation> + <source>Negate filter</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/listfilter.ui" line="60"/> + <source>¬</source> + <translation type="unfinished"/> </message> </context> <context> @@ -3870,6 +3881,14 @@ p, li { white-space: pre-wrap; } </message> </context> <context> + <name>GasSelectionModel</name> + <message> + <location filename="../qt-models/models.cpp" line="52"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>GlobalDrawer</name> <message> <location filename="../mobile-widgets/qml/kirigami/src/controls/GlobalDrawer.qml" line="396"/> @@ -3929,7 +3948,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="546"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="553"/> <source>Location: </source> <translation>Места:</translation> </message> @@ -3937,32 +3956,32 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterDelegate</name> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="494"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="496"/> <source> (same GPS fix)</source> <translation>(те же данные GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="499"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="501"/> <source> (~%1 away</source> <translation> (удаление ~%1</translation> </message> <message numerus="yes"> - <location filename="../desktop-widgets/modeldelegates.cpp" line="500"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="502"/> <source>, %n dive(s) here)</source> <translation><numerusform>, здесь %n дайв)</numerusform><numerusform>, здесь %n дайва)</numerusform><numerusform>, здесь %n дайвов)</numerusform><numerusform>, %n dive(s) here)</numerusform></translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="505"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> <source>(no existing GPS data, add GPS fix from this dive)</source> <translation>(нет данных GPS, скопировать из этого погружения)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="507"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> <source>(no GPS data)</source> <translation>(нет данных GPS)</translation> </message> <message> - <location filename="../desktop-widgets/modeldelegates.cpp" line="509"/> + <location filename="../desktop-widgets/modeldelegates.cpp" line="511"/> <source>Pick site: </source> <translation>Выбрать: </translation> </message> @@ -3970,7 +3989,7 @@ p, li { white-space: pre-wrap; } <context> <name>LocationFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="340"/> + <location filename="../qt-models/filtermodels.cpp" line="338"/> <source>No location set</source> <translation>Место не указано</translation> </message> @@ -4055,7 +4074,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="267"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="268"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> @@ -4077,7 +4096,7 @@ p, li { white-space: pre-wrap; } Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="274"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="275"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4369,7 +4388,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="166"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="561"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -4665,13 +4684,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="673"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="248"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="240"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="681"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="249"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="241"/> <source>&Redo</source> <translation>Повторить</translation> </message> @@ -4706,68 +4725,69 @@ p, li { white-space: pre-wrap; } <translation>Facebook</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.ui" line="719"/> - <source>Take cloud storage online</source> - <translation>Подключить облачное хранилище</translation> + <location filename="../desktop-widgets/mainwindow.ui" line="722"/> + <source>Cloud storage online</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="372"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="408"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="400"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="402"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="394"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="552"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="597"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="544"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="589"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1630"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="558"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="550"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="562"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="670"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="554"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="691"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="614"/> <source>Don't save an empty log to the cloud</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="666"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="687"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="669"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="690"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="677"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="698"/> <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="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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="724"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4777,12 +4797,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="269"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="261"/> <source>Template backup created</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="270"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="262"/> <source>The following backup printing templates were created: %1 @@ -4796,202 +4816,219 @@ can overwrite them on startup.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="728"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> + <source>Please save or cancel the current dive edit before going online</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="658"/> + <source>You have unsaved changes. Do you want to commit them to the cloud storage? +If answering no, the cloud will only be synced on next call to "Open cloud storage" or "Save to cloud storage".</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> + <source>Failure taking cloud storage online</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="765"/> <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="854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="890"/> <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="914"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="950"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="972"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1008"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1061"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1854"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1097"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1067"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1103"/> <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="1114"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1150"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1335"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1326"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1368"/> <source>Dive log files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1313"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1626"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1346"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1389"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1659"/> <source>Subsurface files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1314"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1347"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1390"/> <source>Cochran</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1315"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1348"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1349"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1393"/> <source>JDiveLog</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1317"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1361"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1350"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1394"/> <source>Liquivision</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1318"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1362"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1351"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1395"/> <source>Suunto</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1319"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1352"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1396"/> <source>UDCF</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1320"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1364"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1353"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1397"/> <source>UDDF</source> <translation>UDDF</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1321"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1365"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1354"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1398"/> <source>XML</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1322"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1366"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1355"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1399"/> <source>Divesoft</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1323"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1367"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1356"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1400"/> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1401"/> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1402"/> <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"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1359"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1403"/> <source>OSTCtools</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1371"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1360"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1404"/> <source>DAN DL7</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1358"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1391"/> <source>CSV</source> <translation>CSV</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1372"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1405"/> <source>All files</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1383"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1416"/> <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="1386"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1419"/> <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="1391"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="657"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1424"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1392"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1425"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1658"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1744"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1715"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1746"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1838"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1811"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1839"/> <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="1822"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1850"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1991"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -5039,7 +5076,7 @@ The QML modules QtPositioning and QtLocation could be missing!</source> <context> <name>MultiFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="590"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="597"/> <source>Filter shows %1 (of %2) dives</source> <translation>Показано %1 (из %2) погружений</translation> </message> @@ -5107,89 +5144,89 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PlannerSettingsWidget</name> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>Open circuit</source> <translation>Открытый цикл</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>CCR</source> <translation>CCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="403"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="404"/> <source>pSCR</source> <translation>pSCR</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="494"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> <source>ft/min</source> <translation>фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="495"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> <source>Last stop at 20ft</source> <translation>Последняя остановка на 20фт</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="496"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> <source>50% avg. depth to 20ft</source> <translation>50% ср. глубины - 20фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="497"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> <source>20ft to surface</source> <translation>20фут - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="498"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="499"/> <source>ft</source> <translation>фут</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="500"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> <source>m/min</source> <translation>м/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="501"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> <source>Last stop at 6m</source> <translation>Последняя остановка на 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="502"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> <source>50% avg. depth to 6m</source> <translation>50% ср. глубины - 6м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="503"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> <source>6m to surface</source> <translation>6м - поверхность</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="504"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="505"/> <source>m</source> <translation>м</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="507"/> <location filename="../desktop-widgets/diveplanner.cpp" line="508"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="509"/> <source>cuft/min</source> <translation>куб.фут/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="516"/> <location filename="../desktop-widgets/diveplanner.cpp" line="517"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="518"/> <source>ℓ/min</source> <translation>л/мин</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="526"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="527"/> <source>bar</source> <translation>бар</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="531"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="532"/> <source>psi</source> <translation>psi</translation> </message> @@ -5310,18 +5347,18 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PreferencesGeoreference</name> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="14"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="14"/> <source>Form</source> <translation>Форма</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="20"/> <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/preferences_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5493,58 +5530,58 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa <context> <name>PreferencesLanguage</name> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="14"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="14"/> <source>Form</source> <translation>Форма</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="26"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="26"/> <source>UI language</source> <translation>Язык интерфейса</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="32"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="32"/> <source>Use system default</source> <translation>Использовать системные настройки</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="55"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="55"/> <source>Filter</source> <translation>Фильтр</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="74"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="74"/> <source>Date format</source> <translation>Формат даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="113"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="113"/> <source><html><head/><body><p>Preferred date format. Commonly used fields are</p><p>d (day of month)</p><p>ddd (abbr. day name)</p><p>M (month number)</p><p>MMM (abbr. month name)</p><p>yy/yyyy (2/4 digit year)</p></body></html></source> <translation><html><head/><body><p>Формат даты. Часто используемые описатели</p><p>d (день месяца)</p><p>ddd (день недели)</p><p>M (номер месяца)</p><p>MMM (назв. месяца)</p><p>yy/yyyy (2/4-циферный номер года)</p></body></html></translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="80"/> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="138"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="80"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="138"/> <source>Use UI language default</source> <translation>Из настроек языка интерфейса</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="90"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="90"/> <source>This is used in places where there is less space to show the full date</source> <translation>Используется там, где не хватает места для длинного формата даты</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="93"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="93"/> <source>Short format</source> <translation>Short format</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="132"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="132"/> <source>Time format</source> <translation>Формат времени</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_language.ui" line="151"/> + <location filename="../desktop-widgets/preferences/preferences_language.ui" line="151"/> <source><html><head/><body><p>Preferred time format</p><p>Commonly used format specifiers are</p><p>h (hours in 12h format)</p><p>H (hours in 24h format)</p><p>mm (2 digit minutes)</p><p>ss (2 digit seconds)</p><p>t/tt (a/p or am/pm)</p></body></html></source> <translation><html><head/><body><p>Формат времени</p><p>Часто используемые описатели</p><p>h (часы в 12-часовом формате)</p><p>H (часы в 24-часовом формате)</p><p>mm (минуты)</p><p>ss (секунды)</p><p>t/tt (a/p или am/pm)</p></body></html></translation> </message> @@ -5633,7 +5670,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="145"/> <source>Subsurface cloud storage</source> <translation>Облачное хранилище Subsurface</translation> </message> @@ -5654,26 +5691,21 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="221"/> - <source>Sync to cloud in the background?</source> - <translation>Фоновая синхронизация в облако?</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="228"/> <source>Save Password locally?</source> <translation>Хранить пароль локально?</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="238"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="231"/> <source>Subsurface web service</source> <translation>Веб-сервис Subsurface</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="250"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="243"/> <source>Default user ID</source> <translation>ID пользователя</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.ui" line="260"/> + <location filename="../desktop-widgets/preferences/preferences_network.ui" line="253"/> <source>Save user ID locally?</source> <translation>Сохранять ID пользователя</translation> </message> @@ -5703,24 +5735,33 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>SOCKS прокси</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="73"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="94"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="107"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="72"/> + <source>Change ignored. Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="76"/> + <source>Change ignored. Cloud storage email and new password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="99"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="113"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="133"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage (credentials verified)</source> <translation>Облачное хранилище Subsurface (данные подтверждены)</translation> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="141"/> <source>Subsurface cloud storage (incorrect password)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="143"/> <source>Subsurface cloud storage (PIN required)</source> <translation type="unfinished"/> </message> @@ -6048,123 +6089,123 @@ Please export this template to a different file.</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="756"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="752"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="803"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <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="1401"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1379"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1365"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="774"/> + <location filename="../profile-widget/profilewidget2.cpp" line="748"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="776"/> + <location filename="../profile-widget/profilewidget2.cpp" line="750"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1367"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1382"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1394"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1398"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1403"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1441"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1448"/> <source>Adjust pressure of cyl. %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1498"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1498"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1533"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1534"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1657"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1658"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1663"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -6172,147 +6213,147 @@ Please export this template to a different file.</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="141"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="291"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="168"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="325"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="192"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="200"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="225"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="232"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="257"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="315"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="320"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="353"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="362"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="330"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="404"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="363"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="435"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="371"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="402"/> <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="377"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="408"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="418"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="448"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="469"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="453"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="483"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="461"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="491"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="467"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="497"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="499"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="512"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="525"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="550"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="537"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="562"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="561"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="586"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="573"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="596"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="616"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="636"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="661"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="681"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="686"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="706"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="860"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="861"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="880"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="881"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="859"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="879"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1273"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1293"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6431,7 +6472,7 @@ Please export this template to a different file.</source> <translation>с</translation> </message> <message> - <location filename="../desktop-widgets/diveplanner.cpp" line="63"/> + <location filename="../desktop-widgets/diveplanner.cpp" line="64"/> <source>Remove this point</source> <translation>Удалить эту точку</translation> </message> @@ -6451,22 +6492,22 @@ Please export this template to a different file.</source> <translation>Максимум</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="626"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="512"/> <source>Invalid response from server</source> <translation>Неверный ответ сервера</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="634"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="520"/> <source>Expected XML tag 'DiveDateReader', got instead '%1</source> <translation>XML тег 'DiveDateReader' не найден, получен '%1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="680"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="566"/> <source>Expected XML tag 'DiveDates' not found</source> <translation>XML тег 'DiveDates' не найден</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="687"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="573"/> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> @@ -7089,54 +7130,54 @@ Files with inappropriate date/time</source> </message> <message> <location filename="../desktop-widgets/about.cpp" line="20"/> - <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2017</span></source> - <translation><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Кроссплатформенный журнал погружений<br><span style='font-size: 8pt'>Линус Торвальдс, Дирк Хёндел, Томас Канабрава и другие, 2011-2017</span></translation> + <source><span style='font-size: 18pt; font-weight: bold;'>Subsurface %1 </span><br><br>Multi-platform divelog software<br><span style='font-size: 8pt'>Linus Torvalds, Dirk Hohndel, Tomaz Canabrava, and others, 2011-2018</span></source> + <translation type="unfinished"/> </message> </context> <context> <name>SubsurfaceWebServices</name> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="398"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="284"/> <source>Enter User ID and click Download</source> <translation>Укажите КЛЮЧ и нажмите Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="420"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="308"/> <source>Webservice</source> <translation>Вебсервис</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="506"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="392"/> <source>Connecting...</source> <translation>Соединение...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="525"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="411"/> <source>Download finished</source> <translation>Загрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="539"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="425"/> <source>Download error: %1</source> <translation>Ошибка загрузки: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="549"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="435"/> <source>Connection error: </source> <translation>Ошибка соединения:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="552"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="438"/> <source>Invalid user identifier!</source> <translation>Неверный идентификатор пользователя!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="555"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="441"/> <source>Cannot parse response!</source> <translation>Невозможно разобрать ответ!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="558"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="444"/> <source>Download successful</source> <translation>Загрузка завершена</translation> </message> @@ -7144,7 +7185,7 @@ Files with inappropriate date/time</source> <context> <name>SuitFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="551"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="558"/> <source>Suits: </source> <translation>Костюмы:</translation> </message> @@ -7152,7 +7193,7 @@ Files with inappropriate date/time</source> <context> <name>SuitsFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="168"/> + <location filename="../qt-models/filtermodels.cpp" line="172"/> <source>No suit set</source> <translation>Костюм не указан</translation> </message> @@ -7478,7 +7519,7 @@ mixed from Air and using: <context> <name>TagFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="535"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="542"/> <source>Tags: </source> <translation>Метки:</translation> </message> @@ -7486,7 +7527,7 @@ mixed from Air and using: <context> <name>TagFilterModel</name> <message> - <location filename="../qt-models/filtermodels.cpp" line="193"/> + <location filename="../qt-models/filtermodels.cpp" line="197"/> <source>Empty tags</source> <translation>Без меток</translation> </message> @@ -7685,7 +7726,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="675"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="682"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -7756,12 +7797,12 @@ mixed from Air and using: <translation>Макс. CNS</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <location filename="../qt-models/divetripmodel.cpp" line="365"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../qt-models/divetripmodel.cpp" line="366"/> + <location filename="../qt-models/divetripmodel.cpp" line="365"/> <source>min</source> <translation>мин</translation> </message> @@ -7772,13 +7813,13 @@ mixed from Air and using: </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> <source>kg</source> <translation>кг</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> - <location filename="../qt-models/divetripmodel.cpp" line="423"/> + <location filename="../qt-models/divetripmodel.cpp" line="422"/> <source>lbs</source> <translation>фунт</translation> </message> @@ -7799,7 +7840,7 @@ mixed from Air and using: </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="260"/> - <location filename="../qt-models/divetripmodel.cpp" line="410"/> + <location filename="../qt-models/divetripmodel.cpp" line="409"/> <source>/min</source> <translation>/мин</translation> </message> @@ -8138,12 +8179,12 @@ Language: %1</source> <translation>Выгрузить</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="327"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="213"/> <source>Operation timed out</source> <translation>Таймаут выполнения</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="348"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="234"/> <source>Transferring data...</source> <translation>Передача данных...</translation> </message> @@ -8294,7 +8335,7 @@ Maximum</source> <context> <name>getextFromC</name> <message> - <location filename="../core/libdivecomputer.c" line="795"/> + <location filename="../core/libdivecomputer.c" line="792"/> <source>Error parsing the header</source> <translation>Ошибка разбора заголовка</translation> </message> @@ -8305,40 +8346,40 @@ Maximum</source> <location filename="../core/cochran.c" line="304"/> <location filename="../core/cochran.c" line="310"/> <location filename="../core/cochran.c" line="380"/> - <location filename="../core/libdivecomputer.c" line="253"/> + <location filename="../core/libdivecomputer.c" line="250"/> <source>deco stop</source> <translation>деко стоп</translation> </message> <message> <location filename="../core/cochran.c" line="331"/> <location filename="../core/cochran.c" line="385"/> - <location filename="../core/file.c" line="770"/> - <location filename="../core/libdivecomputer.c" line="255"/> + <location filename="../core/import-csv.c" line="682"/> + <location filename="../core/libdivecomputer.c" line="252"/> <source>ascent</source> <translation>подъем</translation> </message> <message> <location filename="../core/cochran.c" line="337"/> - <location filename="../core/file.c" line="748"/> + <location filename="../core/import-csv.c" line="660"/> <source>battery</source> <translation>батарея</translation> </message> <message> <location filename="../core/cochran.c" line="343"/> - <location filename="../core/libdivecomputer.c" line="271"/> + <location filename="../core/libdivecomputer.c" line="268"/> <source>OLF</source> <translation>OLF</translation> </message> <message> <location filename="../core/cochran.c" line="348"/> - <location filename="../core/libdivecomputer.c" line="270"/> + <location filename="../core/libdivecomputer.c" line="267"/> <source>maxdepth</source> <translation>макс. глуб.</translation> </message> <message> <location filename="../core/cochran.c" line="353"/> <location filename="../core/cochran.c" line="399"/> - <location filename="../core/libdivecomputer.c" line="272"/> + <location filename="../core/libdivecomputer.c" line="269"/> <source>pO₂</source> <translation>pO₂</translation> </message> @@ -8346,110 +8387,111 @@ 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="851"/> - <location filename="../core/libdivecomputer.c" line="263"/> - <location filename="../core/libdivecomputer.c" line="277"/> + <location filename="../core/import-csv.c" line="763"/> + <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/plannernotes.c" line="175"/> <source>gaschange</source> <translation>замена смеси</translation> </message> <message> <location filename="../core/cochran.c" line="365"/> <location filename="../core/cochran.c" line="404"/> - <location filename="../core/libdivecomputer.c" line="254"/> + <location filename="../core/libdivecomputer.c" line="251"/> <source>rbt</source> <translation>оставшееся время на дне</translation> </message> <message> <location filename="../core/cochran.c" line="374"/> <location filename="../core/cochran.c" line="421"/> - <location filename="../core/libdivecomputer.c" line="256"/> + <location filename="../core/libdivecomputer.c" line="253"/> <source>ceiling</source> <translation>потолок</translation> </message> <message> <location filename="../core/cochran.c" line="390"/> - <location filename="../core/libdivecomputer.c" line="258"/> + <location filename="../core/libdivecomputer.c" line="255"/> <source>transmitter</source> <translation>передатчик</translation> </message> <message> - <location filename="../core/datatrak.c" line="258"/> + <location filename="../core/datatrak.c" line="259"/> <source>clear</source> <translation>ясно</translation> </message> <message> - <location filename="../core/datatrak.c" line="261"/> + <location filename="../core/datatrak.c" line="262"/> <source>misty</source> <translation>туман</translation> </message> <message> - <location filename="../core/datatrak.c" line="264"/> + <location filename="../core/datatrak.c" line="265"/> <source>fog</source> <translation>туман</translation> </message> <message> - <location filename="../core/datatrak.c" line="267"/> + <location filename="../core/datatrak.c" line="268"/> <source>rain</source> <translation>дождь</translation> </message> <message> - <location filename="../core/datatrak.c" line="270"/> + <location filename="../core/datatrak.c" line="271"/> <source>storm</source> <translation>шторм</translation> </message> <message> - <location filename="../core/datatrak.c" line="273"/> + <location filename="../core/datatrak.c" line="274"/> <source>snow</source> <translation>снег</translation> </message> <message> - <location filename="../core/datatrak.c" line="293"/> + <location filename="../core/datatrak.c" line="294"/> <source>No suit</source> <translation>Без костюма</translation> </message> <message> - <location filename="../core/datatrak.c" line="296"/> + <location filename="../core/datatrak.c" line="297"/> <source>Shorty</source> <translation>Шорты</translation> </message> <message> - <location filename="../core/datatrak.c" line="299"/> + <location filename="../core/datatrak.c" line="300"/> <source>Combi</source> <translation>Комбинезон</translation> </message> <message> - <location filename="../core/datatrak.c" line="302"/> + <location filename="../core/datatrak.c" line="303"/> <source>Wet suit</source> <translation>Мокрый костюм</translation> </message> <message> - <location filename="../core/datatrak.c" line="305"/> + <location filename="../core/datatrak.c" line="306"/> <source>Semidry suit</source> <translation>Полусухой костюм</translation> </message> <message> - <location filename="../core/datatrak.c" line="308"/> + <location filename="../core/datatrak.c" line="309"/> <source>Dry suit</source> <translation>Сухой костюм</translation> </message> <message> - <location filename="../core/datatrak.c" line="368"/> + <location filename="../core/datatrak.c" line="369"/> <source>no stop</source> <translation>без остановки</translation> </message> <message> - <location filename="../core/datatrak.c" line="370"/> + <location filename="../core/datatrak.c" line="371"/> <location filename="../core/dive.c" line="30"/> <source>deco</source> <translation>деко стоп</translation> </message> <message> - <location filename="../core/datatrak.c" line="372"/> + <location filename="../core/datatrak.c" line="373"/> <source>single ascent</source> <translation>единичный подъем</translation> </message> <message> - <location filename="../core/datatrak.c" line="374"/> + <location filename="../core/datatrak.c" line="375"/> <source>multiple ascent</source> <translation>множественный подъем</translation> </message> @@ -8459,116 +8501,116 @@ Maximum</source> <translation>пресная</translation> </message> <message> - <location filename="../core/datatrak.c" line="376"/> + <location filename="../core/datatrak.c" line="377"/> <source>fresh water</source> <translation>пресная вода</translation> </message> <message> - <location filename="../core/datatrak.c" line="378"/> + <location filename="../core/datatrak.c" line="379"/> <source>salt water</source> <translation>соленая вода</translation> </message> <message> - <location filename="../core/datatrak.c" line="403"/> + <location filename="../core/datatrak.c" line="404"/> <source>sight seeing</source> <translation>обзорная прогулка</translation> </message> <message> - <location filename="../core/datatrak.c" line="405"/> + <location filename="../core/datatrak.c" line="406"/> <source>club dive</source> <translation>погружение с клубом</translation> </message> <message> - <location filename="../core/datatrak.c" line="407"/> + <location filename="../core/datatrak.c" line="408"/> <location filename="../core/dive.c" line="29"/> <source>instructor</source> <translation>инструктор</translation> </message> <message> - <location filename="../core/datatrak.c" line="409"/> + <location filename="../core/datatrak.c" line="410"/> <source>instruction</source> <translation>обучение</translation> </message> <message> - <location filename="../core/datatrak.c" line="411"/> + <location filename="../core/datatrak.c" line="412"/> <location filename="../core/dive.c" line="28"/> <source>night</source> <translation>ночное</translation> </message> <message> - <location filename="../core/datatrak.c" line="413"/> + <location filename="../core/datatrak.c" line="414"/> <location filename="../core/dive.c" line="26"/> <source>cave</source> <translation>пещера</translation> </message> <message> - <location filename="../core/datatrak.c" line="415"/> + <location filename="../core/datatrak.c" line="416"/> <location filename="../core/dive.c" line="25"/> <source>ice</source> <translation>подледное</translation> </message> <message> - <location filename="../core/datatrak.c" line="417"/> + <location filename="../core/datatrak.c" line="418"/> <source>search</source> <translation>поиск</translation> </message> <message> - <location filename="../core/datatrak.c" line="426"/> + <location filename="../core/datatrak.c" line="427"/> <location filename="../core/dive.c" line="26"/> <source>wreck</source> <translation>рэк</translation> </message> <message> - <location filename="../core/datatrak.c" line="428"/> + <location filename="../core/datatrak.c" line="429"/> <location filename="../core/dive.c" line="27"/> <source>river</source> <translation>в реке</translation> </message> <message> - <location filename="../core/datatrak.c" line="430"/> + <location filename="../core/datatrak.c" line="431"/> <location filename="../core/dive.c" line="24"/> <source>drift</source> <translation>течение</translation> </message> <message> - <location filename="../core/datatrak.c" line="432"/> + <location filename="../core/datatrak.c" line="433"/> <location filename="../core/dive.c" line="29"/> <source>photo</source> <translation>фото</translation> </message> <message> - <location filename="../core/datatrak.c" line="434"/> + <location filename="../core/datatrak.c" line="435"/> <source>other</source> <translation>прочее</translation> </message> <message> - <location filename="../core/datatrak.c" line="445"/> + <location filename="../core/datatrak.c" line="446"/> <source>Other activities</source> <translation>Прочие активности</translation> </message> <message> - <location filename="../core/datatrak.c" line="469"/> + <location filename="../core/datatrak.c" line="470"/> <source>Datatrak/Wlog notes</source> <translation>Datatrak/Wlog notes</translation> </message> <message> - <location filename="../core/datatrak.c" line="513"/> + <location filename="../core/datatrak.c" line="514"/> <source>[Warning] Manual dive # %d </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="539"/> + <location filename="../core/datatrak.c" line="540"/> <source>[Error] Out of memory for dive %d. Abort parsing.</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="585"/> + <location filename="../core/datatrak.c" line="587"/> <source>[Error] File is not a DataTrak file. Aborted</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/datatrak.c" line="598"/> + <location filename="../core/datatrak.c" line="600"/> <source>Error: no dive</source> <translation>Ошибка: погружение отсутствует</translation> </message> @@ -8630,8 +8672,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1143"/> <location filename="../core/planner.c" line="1146"/> + <location filename="../core/planner.c" line="1149"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8647,6 +8689,9 @@ Maximum</source> </message> <message> <location filename="../core/dive.c" line="270"/> + <location filename="../core/plannernotes.c" line="58"/> + <location filename="../core/plannernotes.c" line="59"/> + <location filename="../core/plannernotes.c" line="60"/> <location filename="../core/qthelper.cpp" line="662"/> <source>bar</source> <translation>бар</translation> @@ -8716,10 +8761,10 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/divelist.c" line="682"/> + <location filename="../core/divelist.c" line="672"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1139"/> <location filename="../core/planner.c" line="1142"/> + <location filename="../core/planner.c" line="1145"/> <source>air</source> <translation>воздух</translation> </message> @@ -8729,99 +8774,99 @@ Maximum</source> <translation>EAN%d</translation> </message> <message> - <location filename="../core/equipment.c" line="199"/> + <location filename="../core/equipment.c" line="185"/> <source>integrated</source> <translation>интегрированный</translation> </message> <message> - <location filename="../core/equipment.c" line="200"/> + <location filename="../core/equipment.c" line="186"/> <source>belt</source> <translation>пояс</translation> </message> <message> - <location filename="../core/equipment.c" line="201"/> + <location filename="../core/equipment.c" line="187"/> <source>ankle</source> <translation>груз на ноги</translation> </message> <message> - <location filename="../core/equipment.c" line="202"/> + <location filename="../core/equipment.c" line="188"/> <source>backplate</source> <translation>спинка</translation> </message> <message> - <location filename="../core/equipment.c" line="203"/> + <location filename="../core/equipment.c" line="189"/> <source>clip-on</source> <translation>карабины</translation> </message> <message> - <location filename="../core/file.c" line="112"/> + <location filename="../core/file.c" line="113"/> <source>No dives in the input file '%s'</source> <translation>Нет погружений в файле '%s'</translation> </message> <message> - <location filename="../core/file.c" line="122"/> - <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/file.c" line="321"/> + <location filename="../core/import-csv.c" line="115"/> + <location filename="../core/import-csv.c" line="360"/> + <location filename="../core/import-csv.c" line="501"/> + <location filename="../core/import-csv.c" line="839"/> <location filename="../core/ostctools.c" line="49"/> <source>Failed to read '%s'</source> <translation>Ошибка чтения '%s'</translation> </message> <message> - <location filename="../core/file.c" line="391"/> + <location filename="../core/file.c" line="208"/> <source>Cannot open CSV file %s; please use Import log file dialog</source> <comment>'Import log file' should be the same text as corresponding label in Import menu</comment> <translation>Невозможно открыть CSV-файл %s; воспользуйтесь функцией Импорт</translation> </message> <message> - <location filename="../core/file.c" line="506"/> + <location filename="../core/file.c" line="323"/> <source>Empty file '%s'</source> <translation>Пустой файл '%s'</translation> </message> <message> - <location filename="../core/file.c" line="687"/> + <location filename="../core/import-csv.c" line="599"/> <source>Poseidon import failed: unable to read '%s'</source> <translation>Импорт из Poseidon не удался: невозможно прочесть '%s'</translation> </message> <message> - <location filename="../core/file.c" line="723"/> + <location filename="../core/import-csv.c" line="635"/> <source>Mouth piece position OC</source> <translation>Режим загубника ОЦ</translation> </message> <message> - <location filename="../core/file.c" line="727"/> + <location filename="../core/import-csv.c" line="639"/> <source>Mouth piece position CC</source> <translation>Режим загубника ЗЦ</translation> </message> <message> - <location filename="../core/file.c" line="731"/> + <location filename="../core/import-csv.c" line="643"/> <source>Mouth piece position unknown</source> <translation>Режим загубника неизвестен</translation> </message> <message> - <location filename="../core/file.c" line="735"/> + <location filename="../core/import-csv.c" line="647"/> <source>Mouth piece position not connected</source> <translation>Переключатель загубника не подключен</translation> </message> <message> - <location filename="../core/file.c" line="742"/> + <location filename="../core/import-csv.c" line="654"/> <source>Power off</source> <translation>Выключение</translation> </message> <message> - <location filename="../core/file.c" line="792"/> + <location filename="../core/import-csv.c" line="704"/> <source>O₂ calibration failed</source> <translation>Калибровка O₂ не удалась</translation> </message> <message> - <location filename="../core/file.c" line="794"/> - <location filename="../core/file.c" line="803"/> + <location filename="../core/import-csv.c" line="706"/> + <location filename="../core/import-csv.c" line="715"/> <source>O₂ calibration</source> <translation>Калибровка O₂</translation> </message> <message> - <location filename="../core/file.c" line="949"/> + <location filename="../core/import-csv.c" line="234"/> <source>No dive profile found from '%s'</source> <translation type="unfinished"/> </message> @@ -8857,308 +8902,308 @@ Maximum</source> <translation>Облачное хранилице поверждено</translation> </message> <message> - <location filename="../core/git-access.c" line="285"/> + <location filename="../core/git-access.c" line="307"/> <source>Could not update Subsurface cloud storage, try again later</source> <translation>Невозможно обновить облачное хранилище, попробуйте позже</translation> </message> <message> - <location filename="../core/git-access.c" line="345"/> + <location filename="../core/git-access.c" line="367"/> <source>Remote storage and local data diverged. Error: merge failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка слияния (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="375"/> + <location filename="../core/git-access.c" line="397"/> <source>Remote storage and local data diverged. Cannot combine local and remote changes</source> <translation>Данные в локальном и облачном хранилице отличаются. Невозможно объединить изменения.</translation> </message> <message> - <location filename="../core/git-access.c" line="409"/> + <location filename="../core/git-access.c" line="431"/> <source>Remote storage and local data diverged</source> <translation>Данные в локальном и облачном хранилице отличаются</translation> </message> <message> - <location filename="../core/git-access.c" line="412"/> + <location filename="../core/git-access.c" line="434"/> <source>Remote storage and local data diverged. Error: writing the data failed (%s)</source> <translation>Данные в локальном и облачном хранилице отличаются. Ошибка записи (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="421"/> + <location filename="../core/git-access.c" line="443"/> <source>Problems with local cache of Subsurface cloud data</source> <translation>Проблема с локальным кэшем облачного хранилища</translation> </message> <message> - <location filename="../core/git-access.c" line="422"/> + <location filename="../core/git-access.c" line="444"/> <source>Moved cache data to %s. Please try the operation again.</source> <translation>Директория кэша перенесена в %s. Попробуйте снова.</translation> </message> <message> - <location filename="../core/git-access.c" line="469"/> + <location filename="../core/git-access.c" line="491"/> <source>Update local storage to match cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="477"/> + <location filename="../core/git-access.c" line="499"/> <source>Push local changes to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="495"/> + <location filename="../core/git-access.c" line="517"/> <source>Try to merge local changes into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="537"/> + <location filename="../core/git-access.c" line="559"/> <source>Store data into cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="561"/> + <location filename="../core/git-access.c" line="583"/> <source>Sync with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="588"/> + <location filename="../core/git-access.c" line="610"/> <source>Can't reach cloud server, working with local data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="601"/> + <location filename="../core/git-access.c" line="623"/> <source>Successful cloud connection, fetch remote</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="618"/> + <location filename="../core/git-access.c" line="642"/> <source>Done syncing with cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/git-access.c" line="759"/> + <location filename="../core/git-access.c" line="777"/> <source>Error connecting to Subsurface cloud storage</source> <translation>Ошибка подключения к облачному хранилищу Subsurface</translation> </message> <message> - <location filename="../core/git-access.c" line="762"/> + <location filename="../core/git-access.c" line="780"/> <source>git clone of %s failed (%s)</source> <translation>Клонирование git-репозитория %s не удалось (%s)</translation> </message> <message> - <location filename="../core/git-access.c" line="785"/> + <location filename="../core/git-access.c" line="806"/> <source>Synchronising data file</source> <translation type="unfinished"/> </message> <message> <location filename="../core/import-divinglog.c" line="312"/> - <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/uemis-downloader.c" line="137"/> + <location filename="../core/libdivecomputer.c" line="236"/> + <location filename="../core/uemis-downloader.c" line="193"/> <source>unknown</source> <translation>неизвестно</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="252"/> + <location filename="../core/libdivecomputer.c" line="249"/> <source>none</source> <translation>отсутствует</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="257"/> + <location filename="../core/libdivecomputer.c" line="254"/> <source>workload</source> <translation>нагрузка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="259"/> + <location filename="../core/libdivecomputer.c" line="256"/> <source>violation</source> <translation>нарушение</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="260"/> + <location filename="../core/libdivecomputer.c" line="257"/> <source>bookmark</source> <translation>закладка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="261"/> + <location filename="../core/libdivecomputer.c" line="258"/> <source>surface</source> <translation>поверхность</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="262"/> + <location filename="../core/libdivecomputer.c" line="259"/> <source>safety stop</source> <translation>остановка безопасности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="264"/> + <location filename="../core/libdivecomputer.c" line="261"/> <source>safety stop (voluntary)</source> <translation>остановка безопасности (добровольно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="265"/> + <location filename="../core/libdivecomputer.c" line="262"/> <source>safety stop (mandatory)</source> <translation>остановка безопасности (обязательно)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="266"/> + <location filename="../core/libdivecomputer.c" line="263"/> <source>deepstop</source> <translation>глубокая остановка</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="267"/> + <location filename="../core/libdivecomputer.c" line="264"/> <source>ceiling (safety stop)</source> <translation>потолок (остановка безопасности)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="268"/> + <location filename="../core/libdivecomputer.c" line="265"/> <source>below floor</source> <comment>event showing dive is below deco floor and adding deco time</comment> <translation>ниже пола</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="269"/> + <location filename="../core/libdivecomputer.c" line="266"/> <source>divetime</source> <translation>время погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="273"/> + <location filename="../core/libdivecomputer.c" line="270"/> <source>airtime</source> <translation>оставшееся время по воздуху</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="274"/> + <location filename="../core/libdivecomputer.c" line="271"/> <source>rgbm</source> <translation>rgbm</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="275"/> + <location filename="../core/libdivecomputer.c" line="272"/> <source>heading</source> <translation>направление</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="276"/> + <location filename="../core/libdivecomputer.c" line="273"/> <source>tissue level warning</source> <translation>насыщение тканей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="286"/> + <location filename="../core/libdivecomputer.c" line="283"/> <source>invalid event number</source> <translation>неверный номер события</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="607"/> + <location filename="../core/libdivecomputer.c" line="604"/> <source>Error parsing the datetime</source> <translation>Ошибка разбора даты/времени</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="625"/> + <location filename="../core/libdivecomputer.c" line="622"/> <source>Dive %d: %s</source> <translation>Погр. №%d - %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="631"/> + <location filename="../core/libdivecomputer.c" line="628"/> <source>Error parsing the divetime</source> <translation>Ошибка разбора времени погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="641"/> + <location filename="../core/libdivecomputer.c" line="638"/> <source>Error parsing the maxdepth</source> <translation>Ошибка разбора макс. глубины</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="660"/> + <location filename="../core/libdivecomputer.c" line="657"/> <source>Error parsing temperature</source> <translation>Ошибка разбора температуры</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="680"/> + <location filename="../core/libdivecomputer.c" line="677"/> <source>Error parsing the gas mix count</source> <translation>Ошибка разбора счетчика смесей</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="692"/> + <location filename="../core/libdivecomputer.c" line="689"/> <source>Error obtaining water salinity</source> <translation>Ошибка получения солености воды</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="701"/> + <location filename="../core/libdivecomputer.c" line="698"/> <source>Error obtaining surface pressure</source> <translation>Ошибка получения давления на поверхности</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="726"/> + <location filename="../core/libdivecomputer.c" line="723"/> <source>Error obtaining dive mode</source> <translation>Ошибка при получении режима погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="749"/> + <location filename="../core/libdivecomputer.c" line="746"/> <source>Error parsing the gas mix</source> <translation>Ошибка разбора смеси</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="775"/> + <location filename="../core/libdivecomputer.c" line="772"/> <source>Unable to create parser for %s %s</source> <translation>Невозможно создать анализатор для %s %s</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="781"/> + <location filename="../core/libdivecomputer.c" line="778"/> <source>Error registering the data</source> <translation>Ошибка регистрации данных</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="802"/> + <location filename="../core/libdivecomputer.c" line="799"/> <source>Error parsing the samples</source> <translation>Ошибка разбора выборки</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="809"/> + <location filename="../core/libdivecomputer.c" line="806"/> <source>Already downloaded dive at %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="943"/> + <location filename="../core/libdivecomputer.c" line="941"/> <source>Event: waiting for user action</source> <translation>Событие: ожидание действия пользователя</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="962"/> + <location filename="../core/libdivecomputer.c" line="960"/> <source>model=%s firmware=%u serial=%u</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/libdivecomputer.c" line="1024"/> + <location filename="../core/libdivecomputer.c" line="1022"/> <source>Error registering the event handler.</source> <translation>Ошибка регистрации обработчика событий.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1029"/> + <location filename="../core/libdivecomputer.c" line="1027"/> <source>Error registering the cancellation handler.</source> <translation>Ошибка регистрации обработчика завершения.</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1050"/> + <location filename="../core/libdivecomputer.c" line="1048"/> <source>Dive data import error</source> <translation>Ошибка импорта данных погружения</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1089"/> + <location filename="../core/libdivecomputer.c" line="1087"/> <source>Unable to create libdivecomputer context</source> <translation>Невозможно создать контекст libdivecomputer</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1098"/> + <location filename="../core/libdivecomputer.c" line="1096"/> <source>Unable to open %s %s (%s)</source> <translation>Невозможно открыть %s %s (%s)</translation> </message> <message> - <location filename="../core/libdivecomputer.c" line="1123"/> + <location filename="../core/libdivecomputer.c" line="1121"/> <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="1132"/> + <location filename="../core/libdivecomputer.c" line="1130"/> <source>No new dives downloaded from dive computer</source> <translation type="unfinished"/> </message> <message> <location filename="../core/load-git.c" line="197"/> - <location filename="../core/parse-xml.c" line="1132"/> + <location filename="../core/parse-xml.c" line="1139"/> <source>multiple GPS locations for this dive site; also %s </source> <translation>множественные GPS координаты для дайв-сайта, также %s @@ -9173,23 +9218,23 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/load-git.c" line="1719"/> + <location filename="../core/load-git.c" line="1724"/> <source>Load dives from local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/load-git.c" line="1723"/> + <location filename="../core/load-git.c" line="1728"/> <source>Successfully opened dive data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/ostctools.c" line="109"/> - <location filename="../core/ostctools.c" line="141"/> + <location filename="../core/ostctools.c" line="124"/> + <location filename="../core/ostctools.c" line="155"/> <source>Unknown DC in dive %d</source> <translation>Неизвестный дайв-компьютер в погружении %d</translation> </message> <message> - <location filename="../core/ostctools.c" line="154"/> + <location filename="../core/ostctools.c" line="167"/> <source>Error - %s - parsing dive %d</source> <translation>Ошибка %s в погружении %d</translation> </message> @@ -9201,37 +9246,38 @@ You can create this logfile by selecting the corresponding checkbox in the downl </translation> </message> <message> - <location filename="../core/parse-xml.c" line="1593"/> + <location filename="../core/parse-xml.c" line="1600"/> <source>Failed to parse '%s'</source> <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="2034"/> + <location filename="../core/parse-xml.c" line="2033"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="62"/> + <location filename="../core/plannernotes.c" line="97"/> <source>DISCLAIMER / WARNING: THIS IS A NEW IMPLEMENTATION OF THE %s ALGORITHM AND A DIVE PLANNER IMPLEMENTATION BASED ON THAT WHICH HAS RECEIVED ONLY A LIMITED AMOUNT OF TESTING. WE STRONGLY RECOMMEND NOT TO PLAN DIVES SIMPLY BASED ON THE RESULTS GIVEN HERE.</source> <translation>ОТКАЗ ОТ ОТВЕТСТВЕННОСТИ / ВНИМАНИЕ: В ПЛАНИРОВЩИКЕ ИСПОЛЬЗУЕТСЯ НОВАЯ РЕАЛИЗАЦИЯ АЛГОРИТМА %s, КОТОРАЯ БЫЛА НЕДОСТАТОЧНО ПРОТЕСТИРОВАНА. МЫ НАСТОЯТЕЛЬНО РЕКОМЕНДУЕМ НЕ ПЛАНИРОВАТЬ ПОГРУЖЕНИЯ ТОЛЬКО НА ОСНОВЕ ЭТИХ РЕЗУЛЬТАТОВ.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="76"/> + <location filename="../core/plannernotes.c" line="108"/> <source>Decompression calculation aborted due to excessive time</source> <translation>Расчет деко прекращен из-за большой длительности</translation> </message> <message> - <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="401"/> - <location filename="../core/plannernotes.c" line="407"/> - <location filename="../core/plannernotes.c" line="446"/> - <location filename="../core/plannernotes.c" line="489"/> - <location filename="../core/plannernotes.c" line="501"/> + <location filename="../core/plannernotes.c" line="110"/> + <location filename="../core/plannernotes.c" line="468"/> + <location filename="../core/plannernotes.c" line="474"/> + <location filename="../core/plannernotes.c" line="513"/> + <location filename="../core/plannernotes.c" line="544"/> + <location filename="../core/plannernotes.c" line="572"/> + <location filename="../core/plannernotes.c" line="585"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="342"/> + <location filename="../core/plannernotes.c" line="411"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> @@ -9242,231 +9288,257 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>изменение SP</translation> </message> <message> - <location filename="../core/plannernotes.c" line="57"/> + <location filename="../core/plannernotes.c" line="92"/> <source>VPM-B</source> <translation>VPM-B</translation> </message> <message> - <location filename="../core/plannernotes.c" line="59"/> + <location filename="../core/plannernotes.c" line="94"/> <source>BUHLMANN</source> <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="150"/> <source>Runtime: %dmin<br></div></source> <translation>Рантайм: %dмин<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="155"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/plannernotes.c" line="126"/> + <location filename="../core/plannernotes.c" line="158"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../core/plannernotes.c" line="129"/> + <location filename="../core/plannernotes.c" line="161"/> + <location filename="../core/plannernotes.c" line="173"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/plannernotes.c" line="132"/> + <location filename="../core/plannernotes.c" line="164"/> <source>gas</source> <translation>смесь</translation> </message> <message> + <location filename="../core/plannernotes.c" line="171"/> + <source>Isobaric counterdiffusion information</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="177"/> + <source>&#916;He</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="179"/> + <source>&#916;N&#8322;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="181"/> + <source>max &#916;N&#8322;</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="231"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="187"/> + <location filename="../core/plannernotes.c" line="238"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="200"/> + <location filename="../core/plannernotes.c" line="251"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="207"/> + <location filename="../core/plannernotes.c" line="258"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="253"/> + <location filename="../core/plannernotes.c" line="304"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="256"/> - <location filename="../core/plannernotes.c" line="260"/> + <location filename="../core/plannernotes.c" line="307"/> + <location filename="../core/plannernotes.c" line="311"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/plannernotes.c" line="269"/> - <location filename="../core/plannernotes.c" line="281"/> + <location filename="../core/plannernotes.c" line="320"/> + <location filename="../core/plannernotes.c" line="338"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="304"/> + <location filename="../core/plannernotes.c" line="367"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="306"/> + <location filename="../core/plannernotes.c" line="369"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="326"/> + <location filename="../core/plannernotes.c" line="395"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="328"/> + <location filename="../core/plannernotes.c" line="397"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="338"/> + <location filename="../core/plannernotes.c" line="407"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> </message> <message> - <location filename="../core/plannernotes.c" line="433"/> + <location filename="../core/plannernotes.c" line="500"/> <source>Minimum gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="434"/> + <location filename="../core/plannernotes.c" line="501"/> <source>based on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="436"/> + <location filename="../core/plannernotes.c" line="503"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="454"/> + <location filename="../core/plannernotes.c" line="522"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="458"/> + <location filename="../core/plannernotes.c" line="527"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s during planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="461"/> + <location filename="../core/plannernotes.c" line="530"/> <source>%.0f%s of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="99"/> - <location filename="../core/plannernotes.c" line="105"/> + <location filename="../core/plannernotes.c" line="119"/> + <location filename="../core/plannernotes.c" line="129"/> + <location filename="../core/plannernotes.c" line="137"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="107"/> + <location filename="../core/plannernotes.c" line="139"/> <source>dive plan</b> (surface interval </source> <translation>план погружения</b> (поверх. интервал </translation> </message> <message> - <location filename="../core/plannernotes.c" line="109"/> + <location filename="../core/plannernotes.c" line="141"/> <source>created on</source> <translation>создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="101"/> + <location filename="../core/plannernotes.c" line="131"/> <source>dive plan</b> created on</source> <translation>план погружения</b> создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="121"/> <source>dive plan</b> (overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="147"/> <source>Runtime: %dmin%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="402"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="340"/> + <location filename="../core/plannernotes.c" line="409"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="346"/> + <location filename="../core/plannernotes.c" line="415"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Рекреационный режим по модели Bühlmann ZHL-16B с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="354"/> + <location filename="../core/plannernotes.c" line="423"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="372"/> + <location filename="../core/plannernotes.c" line="439"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="374"/> + <location filename="../core/plannernotes.c" line="441"/> <source>Gas consumption (based on SAC</source> <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="402"/> + <location filename="../core/plannernotes.c" line="469"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="408"/> + <location filename="../core/plannernotes.c" line="475"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/plannernotes.c" line="447"/> + <location filename="../core/plannernotes.c" line="514"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="452"/> + <location filename="../core/plannernotes.c" line="519"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s из <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="486"/> + <location filename="../core/plannernotes.c" line="545"/> + <source>Isobaric counterdiffusion conditions exceeded</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="569"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="498"/> + <location filename="../core/plannernotes.c" line="582"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="876"/> + <location filename="../core/planner.c" line="879"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1147"/> + <location filename="../core/planner.c" line="1150"/> <source>ean</source> <translation>ean</translation> </message> @@ -10129,97 +10201,62 @@ EADD: %d%s / %.1fg/ℓ <translation>(нет погружений)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Sun</source> - <translation>Вск</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Mon</source> - <translation>Пнд</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Tue</source> - <translation>Втр</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Wed</source> - <translation>Срд</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Thu</source> - <translation>Чтв</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Fri</source> - <translation>Птн</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="131"/> - <source>Sat</source> - <translation>Суб</translation> - </message> - <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="140"/> + <location filename="../core/subsurfacestartup.c" line="130"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="141"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10254,92 +10291,92 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Не погружений для загрузки.</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="450"/> + <location filename="../core/uemis-downloader.c" line="507"/> <source>%s %s</source> <translation>%s %s</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="470"/> + <location filename="../core/uemis-downloader.c" line="527"/> <source>data</source> <translation>данные</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="498"/> + <location filename="../core/uemis-downloader.c" line="555"/> <source>dive log #</source> <translation>Журнал №</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="500"/> + <location filename="../core/uemis-downloader.c" line="557"/> <source>dive spot #</source> <translation>Место №</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="502"/> + <location filename="../core/uemis-downloader.c" line="559"/> <source>details for #</source> <translation>детали для №</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>wetsuit</source> <translation>мокрый</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>semidry</source> <translation>полусухой</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="705"/> + <location filename="../core/uemis-downloader.c" line="789"/> <source>drysuit</source> <translation>сухой</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>shorty</source> <translation>короткий</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>vest</source> <translation>жилет</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>long john</source> <translation>комбинезон</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>jacket</source> <translation>куртка</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>full suit</source> <translation>полный</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="706"/> + <location filename="../core/uemis-downloader.c" line="790"/> <source>2 pcs full suit</source> <translation>полный из 2-х</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="707"/> + <location filename="../core/uemis-downloader.c" line="791"/> <source>membrane</source> <translation>мембрана</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1237"/> + <location filename="../core/uemis-downloader.c" line="1328"/> <source>Initialise communication</source> <translation>Инициализация соединения</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1240"/> + <location filename="../core/uemis-downloader.c" line="1331"/> <source>Uemis init failed</source> <translation>Ошибка инициализации Uemis</translation> </message> <message> - <location filename="../core/uemis-downloader.c" line="1252"/> + <location filename="../core/uemis-downloader.c" line="1343"/> <source>Start download</source> <translation>Начать загрузку</translation> </message> @@ -10449,7 +10486,8 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Длительность:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="48"/> + <location filename="../core/plannernotes.c" line="505"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>мин</translation> @@ -10595,22 +10633,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="956"/> + <location filename="../core/save-git.c" line="958"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="965"/> + <location filename="../core/save-git.c" line="967"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="998"/> + <location filename="../core/save-git.c" line="1000"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1238"/> + <location filename="../core/save-git.c" line="1248"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> @@ -10628,112 +10666,112 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Subsurface</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="119"/> + <location filename="../mobile-widgets/qml/main.qml" line="121"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="135"/> + <location filename="../mobile-widgets/qml/main.qml" line="139"/> <source>Dive management</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="239"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Disable location service</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="256"/> + <location filename="../mobile-widgets/qml/main.qml" line="290"/> <source>Settings</source> <translation>Настройки</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="138"/> + <location filename="../mobile-widgets/qml/main.qml" line="144"/> <source>Add dive manually</source> <translation>Добавить погружение вручную</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="149"/> + <location filename="../mobile-widgets/qml/main.qml" line="157"/> <source>Download from DC</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="166"/> + <location filename="../mobile-widgets/qml/main.qml" line="178"/> <source>Manual sync with cloud</source> <translation>Ручная синхронизация с облаком</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Offline mode</source> <translation>Режим "Без Интернета"</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="190"/> + <location filename="../mobile-widgets/qml/main.qml" line="204"/> <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="199"/> + <location filename="../mobile-widgets/qml/main.qml" line="215"/> <source>GPS</source> <translation>GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="285"/> + <location filename="../mobile-widgets/qml/main.qml" line="323"/> <source>Help</source> <translation>Справка</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="204"/> + <location filename="../mobile-widgets/qml/main.qml" line="222"/> <source>Upload GPS data</source> <translation>Выгрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="159"/> + <location filename="../mobile-widgets/qml/main.qml" line="169"/> <source>Apply GPS fixes</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="185"/> + <location filename="../mobile-widgets/qml/main.qml" line="199"/> <source>Auto cloud sync enabled</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="212"/> + <location filename="../mobile-widgets/qml/main.qml" line="233"/> <source>Download GPS data</source> <translation>Загрузить данные GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="220"/> + <location filename="../mobile-widgets/qml/main.qml" line="244"/> <source>Show GPS fixes</source> <translation>Показать точки GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="231"/> + <location filename="../mobile-widgets/qml/main.qml" line="257"/> <source>Clear GPS cache</source> <translation>Очистить кэш GPS</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="265"/> + <location filename="../mobile-widgets/qml/main.qml" line="301"/> <source>Developer</source> <translation>Разработчик</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="268"/> + <location filename="../mobile-widgets/qml/main.qml" line="304"/> <source>App log</source> <translation>Журнал приложения</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="276"/> + <location filename="../mobile-widgets/qml/main.qml" line="312"/> <source>Theme information</source> <translation>Тема оформления</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="247"/> + <location filename="../mobile-widgets/qml/main.qml" line="279"/> <source>About</source> <translation>О программе</translation> </message> <message> - <location filename="../mobile-widgets/qml/main.qml" line="239"/> + <location filename="../mobile-widgets/qml/main.qml" line="268"/> <source>Run location service</source> <translation>Запустить службу позиционирования</translation> </message> |