diff options
Diffstat (limited to 'translations')
28 files changed, 10528 insertions, 9125 deletions
diff --git a/translations/subsurface_bg_BG.ts b/translations/subsurface_bg_BG.ts index c69ff7f3d..2955d33a4 100644 --- a/translations/subsurface_bg_BG.ts +++ b/translations/subsurface_bg_BG.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Кликнете тук за да изтриете бутилка</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Превключи дълбочина за Деко газа, изчислен от Деко pO₂ настройката, освен ако не е зададен ръчно.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Изчислено с "Долен pO₂" настройката. Задаване на MOD променя O₂%. Задайте като '*' за най-добър O₂% при макс. дъбочина.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Изичислено с "Най-добър Mix END" настройката. Задаване на MND променя He%. Задайте като '*' за най-добър He% при макс. дълбочина.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Този газ се използвза. Само бутилки, които не се използват в гмуркането могат да бъдат премахнати.</translation> </message> @@ -2052,67 +2060,67 @@ GPS позиция:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Няма профил за показ</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Водолазен костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Темп. на въздух:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Бутилка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Темп. на водата:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Разпредели</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Оценка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Видимост</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Водач:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Тегло:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Партньор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Бележки</translation> </message> @@ -2120,23 +2128,23 @@ GPS позиция:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (бут. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Ръчно включване на OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> край</translation> @@ -2174,23 +2182,23 @@ GPS позиция:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Списък на гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Моля натиснете '+' бутона за да добавите гмуркане (или да изтеглите гмуркания от леководолазен компютър)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Няма гмуркания в списъка</translation> </message> @@ -2198,102 +2206,102 @@ GPS позиция:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Разшири всички</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Свиване на всички</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Свиване на други</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Изтрий гмуркане (гмуркания) от пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Създай ново пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Добави гмуркане (гмуркания) веднага над пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Добави гмуркане(гмуркания) веднага под пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Слей пътуване с горно пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Слей пътуване с долно пътуване</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Изтрий гмуркане (гмуркания)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Маркирай гмуркания (гмуркане) като невалидни</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Слей избраните гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Преномерирай гмуркане (гмуркания)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Измести времена на гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Рздели избраните гмуркания</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Зареди изображение(изображения) от файл(файлове).</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Зареди изображение от интернет</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Файлове с изображения (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 не е изображение</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Отвори изображения</translation> </message> @@ -2301,12 +2309,12 @@ GPS позиция:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Създай ново място на гмуркане и копирай информация от текущото гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Създай ново място на гмуркане с име</translation> </message> @@ -2966,27 +2974,33 @@ GPS позиция:</translation> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>Бут.</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Финална дълбочина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Teчащо време</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Продълж. (мин.)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Използван газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ GPS позиция:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Дълбочина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Време</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Налягане</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Температура:</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Цвят</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Въведено от потребителя</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Индекс на бутилка</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Налягане S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Налягане I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Таван</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Сетпойнт</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Сензор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Сензор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Сензор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Околно налягане</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Сърдечен ритъм</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Градиент фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Средна дълбочина @ сек</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>грешка при писане на zip файл: %s zip грешка %d системна грешка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Обновяване на списъка от гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Изтегляне на списък от гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Изтегляне на %1 гмуркания...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Изтеглянето приключи - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Проблем при тегленето</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Архива не може да бъде отворен: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Неправилно изтегляне</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Архива не може да бъде отворен: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Качването приключи</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Грешка при качването</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Успешно качване</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Грешка при логин</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Не може да бъде направен разбор на отговора</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Грешка: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Изтегли</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Избери режим на Bluetooth теглене</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Връзване с леководолазен компютър</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Грешка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Намери Uemis леководолазен компютър</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Откажи теглене</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Изтегли</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Отмяна</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth не е включен</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Производител:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Леководолазен компютър</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Връзка:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Опитай пак</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Изход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Изтеглени гмуркания</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Информация:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Приеми</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Селектирай всички</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Деселектирай всички</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Вържи към Фейсбук текст</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>За да откачине Subsurface от фашия Facebook акаунт използвайте 'Сподели към' - 'Share on' - менюто.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>За да се свържете с Facebook, моля въведете потребител и парола. Това позволява на Subsurface да публикува гмуркания на вашия таймлайн.</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Вход във Фейсбук успешен</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Грешка - непознат потребител.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Гмуркането бе качено успешно във Фейсбук</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Качването на гмуркане неуспешно. Моля вижте дебъг текста и го пратете на Subsurface мейлинг списъка.</translation> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Редакция на мяста за гмуркане</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Сигурни ли сте че искате да продължите?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Вие редактирате място за гмуркане</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>Ново място за гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Изтрий промените?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Вие ще изтриете промените.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Отвори</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Отмени</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Върни</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Зареди облаковия слад онлайн</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Свържи се към</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Излючи се от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да отворите нов файл.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Отвори файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Отмяна</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Не записвай празен регистър в облака</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Обходи папки с изображения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Сканирай</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Сканиране за изборажения...(това може да отнеме доста време)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4693,104 +4707,104 @@ p, li { white-space: pre-wrap; } <translation>Опит за смесване на гмуркания с %1мин. интервал помежду им</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Моля затворете текущата редакция на гмуркане преди да затворите файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Моля запишете или отменете текущата редакция на гмуркане преди да добавите гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Напечатай рунтайм таблица</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Опит за плануване на гмуркане, което не е планувано гмуркане.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Моля, първо приключете с редакцията преди да започнете нова.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Опит за редакция на гмуркане, което не е ръчно добавено.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Годишни статистики</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Желаете ли да запишете промените във файла %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Желаете ли да запишете промените във файла с данни?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Запиши промените?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Промените ще бъдат изгубени ако не ги запишете.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Запиши файла като</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлове (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[локален кеш за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[облаков склад за] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Отваряне на файл от стара версия</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вие отворихте файл от стара версия на Subsurface. Моля прочетете Ръковордството на потребителя за да разберете за промените в новата версия и конкретно за редакцията на места за гмуркане. Subsurface вече се опита да попълни данните автоматично, но би било добре да проверите дали местата за гмуркане са правилни.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Отвори регистър файл</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log файлове (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran файлове (*.can *.CAN);;CSV файлове (*.csv *.CSV);;DiveLog.de файлове (*.dld *.DLD);;JDiveLog файлове (*.jlb *.JLB);;Liquivision файлове (*.lvd *.LVD);;MkVI файлове (*.txt *.TXT);;Suunto файлове (*.sde *.db *.SDE *.DB);;Divesoft файлове (*.dlf *.DLF);;UDDF/UDCF файлове (*.uddf *.udcf *.UDDF *.UDCF);;XML файлове (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog файлове (*.log *.LOG);;OSTCtools файлове (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Всички файлове (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Връзване към обклаковия склад...</translation> </message> @@ -4798,7 +4812,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Завлечете маркера на гмуркането</translation> </message> @@ -5116,32 +5130,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Гео търсене на място за гмуркане</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Включи геокодиране за редакцията на места за гмуркане</translation> + <source>Dive site layout</source> + <translation>Оформление на място за гмуркане</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Разбор на място без GPS данни</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Същия формат за съществуващи гмуркания</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Оформление на мяста за гмуркане</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface облков склад</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface облков склад (паролата проверена)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Импорт на шаблон файл</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML файлове (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Експорт на шаблонен файл като</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Това действие на може да бъде върнато!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Изтрий шаблон: %1?</translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (№%1 от %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Непознат гмуркачески компютър</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Показването на NDL / TTS бе изключено поради прекалено дълго време за обработка на данните</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Добави промяна на газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Танк %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Направи първи гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Планирано гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Ръчно добавено гмуркане</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Изтрий този гмуркачески компютър</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Добави set-point промяна</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Добави бележка</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Редакция на профил</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Премахни събитие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Премахни малки събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Редактирай име</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Промени налягането на бутилка %1 (текущо интерполирана като %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Покажи всички събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Скрий събития</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Скрий всички %1 събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Премахни избраните събития?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Редактирай име в показалец</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Потребителско име:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation> Името е прекалено дълго!</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Стартиране...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Отвори локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Отварянето на локален файл с данни неуспешно</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 гмуркания заредени от локален файл с данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>режим на работа без облак</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Грешка при разряда на локалния склад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>няма облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Моля въведете валидни облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Е-мейла и паролата за облаковия склад могат да съдържат букви, числа, '.', '-', '_' и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Грешен формат на имейл адрес</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Опит за отваряна не облаковия склад с нови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Тестване на облакови пълномощия</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Няма отговор от облаковия сървър за да провери вашите данни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Грешнен потребител или парола към облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Няма връзка към облаковия слад - акаунтът ви не е проверен</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Облаковите пълномощия са невалидни</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Облаковия склад не може да бъде отворен: грешка в HTTPS връзката</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Облаковия склад не може да бъде отворен: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Няма връзка към облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Зареждане на гмуркания...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Грешка в облаков слад: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Зареждане на гмуркания от локален склад (режим без облак)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Не може да бъде осъществена връзка с облаковия слад</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облаковия слад беше отворен успешно. Няма гмуркания в регистъра.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>ч.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>сек.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Непозната GPS позиция</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Грешен XML отговор. Ред %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Няма категории за оформление на място за гмуркане в настройките!</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Тагове</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Малък</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Средно</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Дата на гмуркане: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Времетраене: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Местонахождение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Партньор: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Водач: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>За да използвате Subsurface-mobile с облаковия слад, моля въдете вашите пълномощия.<br/><br/>Ако това е първия път когато използвате облака, моля въведете валиден имейл адрес (малки букви) и парола (букви и цифри).<br/><br/>За да използвате мобилната версия на Subsurface само локално, изберете опцията без олак.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Благодарим, че се регистрирайте в Subsurface. Изпратихме на <b>%1</b> ПИН кода за довършване на регистрацията. Ако не получите имейл до 15 минути, моля проверете правописа на имейл адреса и също така проверете Спам папката си.<br/><br/>Ако имате проблеми при регистрацията, моля свържете се с нас в Форума (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7441,7 +7455,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1щтракни за да посетиш %2</translation> </message> @@ -8397,8 +8411,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8483,15 +8497,15 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>въздух</translation> </message> @@ -8720,7 +8734,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8981,7 +8995,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Не може да бъде напревен разбор на '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Не може да бъде отворен стилов файл %s</translation> </message> @@ -8997,21 +9011,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Предупреждение:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, ефективно GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP промяна</translation> @@ -9027,195 +9041,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>Гмуркачески план </b> (Припокриване на гмуркания установено)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Времетраене: %dмин<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>дълбочина</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>продължителност</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>времетраене</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>газ</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Преход към %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s (SP = %.1f бара)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остани на %.*f %s за %d:%02d мин - времетраене %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1f бара)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Превключи газ към %s (SP = %.1f бара)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Превключи газ на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Деко модел VPM-B при номинален консерватизъм</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Минимален газ</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>базиран на</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>гмуркачески план</b> (интервал на повърхност</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>създаден на</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>гмуркачески план</b> създаден на</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Времетраене: %dмин. ВАРИАЦИИ<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко модел: Bühlmann ZHL-16C с GFLow = %d%% и GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Деко модел: VPM-B при +%d консерватизъм</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко модел: "Развлекателен режим" базиран на Bühlmann ZHL-16B с GFLow = %d%% и GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM налягане: %d милибара (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Консумация на газ (CCR крака включени):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Консумация на газ (базирана на SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>има повече газ от този на разположение в избраната бултилка</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>няма достатъчно резерв за газово споделяне при изкачване!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Минимален газ</span> (Базиран на %.1fxSAC/+%dмин@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>Изисквания минимален газ за изкачаване вече надвишава стартовото налягане на бутилката!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в планирано изкачване)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s в планирано изкачване) от <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>висока pO₂ стойност %.2f при %d:%02u с газ %s на дълбочина %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>ниска pO₂ стойност %.2f към %d:%02u с газ %s при дълбочина %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Не може да бъде намерен газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9817,6 +9847,31 @@ EADD: %d%s / %.1fгр./л. <translation>Статус на гмуркане</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Свободно гмуркане</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Всички (според статистики на пътуване)</translation> @@ -9852,97 +9907,97 @@ EADD: %d%s / %.1fгр./л. <translation>(няма гмуркания)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Нед</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Пон</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Вт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Ср</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Чет</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Пет</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Съб</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Ян</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Март</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Юни</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Юли</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Сеп</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Нов</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10172,6 +10227,7 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Продължителност:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>мин</translation> @@ -10277,7 +10333,7 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Дълбочина</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>планирана точка над таван</translation> </message> @@ -10317,22 +10373,22 @@ Uemis Zurich включен ли е правилно?</translation> <translation>Град</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Започни запис на данни</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Започни запис на гмуркания</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Локален кеш създаден</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Подготовка за запис на данни</translation> </message> diff --git a/translations/subsurface_ca.ts b/translations/subsurface_ca.ts index 62cd7c754..cb302ed52 100644 --- a/translations/subsurface_ca.ts +++ b/translations/subsurface_ca.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Feu clic aquí per eliminar aquesta ampolla.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="272"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Canviar la profunditat del gas de descompressió. Calculat emprant la preferència pO₂ per a la descompressió, llevat que s'estableixi manualment.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculat emprant la preferència pO₂ inferior. Establint els ajustaments MOD del percentatge de O₂, ajustat a «*» per al millor percentatge de O₂ per a la profunditat màxima.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculat emprant la preferència final per a la millor barreja. Establint els ajustaments MND del percentatge de He, ajustat a «*» per al millor percentatge de He per a la profunditat màxima.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="258"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Aquest gas s'està emprant. Només es poden eliminar les ampolles que no s'empren durant la immersió.</translation> </message> @@ -2174,23 +2182,23 @@ GPS actual:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Llista d'immersions</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Credencials del núvol</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Toqueu el botó «+» per afegir una immersió (o baixeu les immersions des d'un ordinador de busseig admès)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>No hi ha cap immersió a la llista</translation> </message> @@ -2198,102 +2206,102 @@ GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandeix-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Redueix-ho tot</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Redueix les altres</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Elimina la/es immersió/ns del viatge</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Crea un nou viatge per sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Afegeix una/es immersió/ns al viatge de sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Afegeix una/es immersió/ns al viatge de sota</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Combina un viatge amb el viatge de sobre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Combina un viatge amb el viatge de sota</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Suprimeix la/es immersió/ns</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marca la/es immersió/ns com a no vàlida/es</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Fusiona les immersions seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Torna a numerar la/es immersions</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Desplaça l'hora de la immersió</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Divideix les immersions seleccionades</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Carrega la/es imatge/s des de fitxer/s</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Carrega la imatge des del web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Fitxers d'imatge (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 no aparenta ser una imatge</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Obre fitxers d'imatge</translation> </message> @@ -3368,81 +3376,81 @@ p, li { white-space: pre-wrap; } <translation>Error en escriure el fitxer ZIP: error ZIP %s, error del sistema %d «%d - %s»</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Fet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>S'està publicant la llista de les immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>S'està baixant la llista de les immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>S'estan baixant %1 immersions…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Baixada finalitzada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problema amb la baixada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>L'arxiu no s'ha pogut obrir:</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Baixada corrompuda</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>L'arxiu no s'ha pogut obrir: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>La publicació ha finalitzat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Ha fallat la publicació</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Publicació correcta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Ha fallat l'accés</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>No s'ha pogut interpretar la resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3660,17 +3668,17 @@ a la llista d'immersions.</translation> <translation>Informació:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accepta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Selecciona-ho tot</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Desselecciona-ho tot</translation> </message> @@ -3701,12 +3709,12 @@ a la llista d'immersions.</translation> <translation>Connecta amb el marcador de posició de text de Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Per a desconnectar el Subsurface del vostre compte al Facebook, empreu l'entrada de menú «Comparteix».</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Per a connectar amb Facebook, inicieu una sessió. Això permetrà al Subsurface publicar les immersions al vostre historial</translation> </message> @@ -3714,22 +3722,22 @@ a la llista d'immersions.</translation> <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>S'ha accedit al Facebook amb èxit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, ID d'usuari desconegut, no s'ha pogut accedir.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>S'ha publicat la immersió al Facebook amb èxit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Ha fallat la publicació de la immersió. Vegeu la sortida de depuració i envieu-la a la llista de correu del Subsurface</translation> </message> @@ -4294,7 +4302,7 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Obre</translation> </message> @@ -4590,13 +4598,13 @@ Segur que voleu continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Desfés</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Refés</translation> </message> @@ -4636,63 +4644,63 @@ Segur que voleu continuar?</translation> <translation>Pren l'emmagatzematge al núvol en línia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Connecta a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Desconnecta de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'obrir un altre fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Obre un fitxer</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancel·la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> <source>Don't save an empty log to the cloud</source> <translation>No desis un registre buit al núvol</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Travessa els directoris amb imatges</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Explora</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>S'estan cercant les imatges... (això pot trigar una estona)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Avís</translation> </message> @@ -4702,100 +4710,100 @@ Segur que voleu continuar?</translation> <translation>S'estan intentant fusionar les immersions amb un interval d'entre %1 min.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans de tancar el fitxer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Si us plau, deseu o cancel·leu l'edició de la immersió actual abans d'intentar afegir-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Imprimeix la taula del temps acumulat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>S'està intentant tornar a planificar una immersió que encara havia estat planificada.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Si us plau, finalitzeu l'edició actual abans d'intentar fer-ne una altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>S'està intentant editar una immersió que no ha estat afegida manualment.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Estadístiques anuals</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voleu desar els canvis que heu fet en el fitxer %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voleu desar els canvis que heu fet en el fitxer de dades?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Deso els canvis?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Si sortiu sense desar, els canvis es perdran.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Desa el fitxer com a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fitxers en XML del Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[cau local per a] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[emmagatzematge al núvol de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>S'està obrint el fitxer de dades d'una versió anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has obert un fitxer de dades d'una versió anterior del Subsurface. Recomanem llegir el manual per aprendre sobre els canvis en la nova versió, especialment la gestió dels punts d'immersió que ha variat significativament. El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perdre un moment en donar una ullada al nou sistema per a la gestió dels punts d'immersió, per assegurar-vos que tot està correcte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Obre un fitxer de diari de busseig</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Fitxers de diari de busseig (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Fitxers del Cochran (*.can *.CAN);;Fitxers en CSV (*.csv *.CSV);;Fitxers del DiveLog (*.dld *.DLD);;Fitxers del JDiveLog (*.jlb *.JLB);;Fitxers del Liquivision (*.lvd *.LVD);;Fitxers del MkVI (*.txt *.TXT);;Fitxers del Suunto (*.sde *.db *.SDE *.DB);;Fitxers del Divesoft (*.dlf *.DLF);;Fitxers de la UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Fitxers en XML (*.xml *.XML);;Visor de diaris APD (*.apd *.APD);;Fitxers del Datatrak/WLog (*.log *.LOG);;Fitxers de les OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Tots els fitxers (*)</translation> </message> @@ -4808,7 +4816,7 @@ El Subsurface ja ha intentat omplir les dades, però potser valdrà la pena perd <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Arrossegueu el lloc d'immersió seleccionat</translation> </message> @@ -5126,32 +5134,12 @@ Si el vostre dispositiu usa Bluetooth, feu els mateixos preparatius que per a ba </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Recerca geogràfica dels punts d'immersió</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Habilita la georeferenciació per a la gestió dels punts d'immersió</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Analitza els llocs sense dades GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>El mateix format per a les immersions existents</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> <source>Dive site layout</source> <translation>Disposició del punt d'immersió</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5455,7 +5443,7 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Emmagatzematge al núvol del Subsurface</translation> </message> @@ -5536,6 +5524,16 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Emmagatzematge al núvol del Subsurface (credencials verificades)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5850,17 +5848,17 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Mostrar la LND / TTS ha estat inhabilitat pel temps de procès excessiu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Afegeix un canvi de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Ampolla %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Crea el primer ordinador de busseig</translation> </message> @@ -5875,83 +5873,83 @@ Vegeu http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Immersió afegida manualment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Suprimeix aquest ordinador de busseig</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Afegeix un canvi de punt d'ajust</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Afegeix una adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Edita el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Elimina l'esdeveniment</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Oculta els esdeveniments similars</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Edita el nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajusta la pressió de l'ampolla %1 (actualment interpolada com %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Revela tots els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Oculta els esdeveniments</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Oculto tots els esdeveniments %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Elimino l'esdeveniment seleccionat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Edita el nom de l'adreça d'interès</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nom personalitzat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>El nom és massa llarg!</translation> </message> @@ -6682,61 +6680,61 @@ Fitxers amb una data/hora inapropiada</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mitja</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data de la immersió: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durada: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lloc de la immersió: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Company: %1</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Líder de busseig: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7458,7 +7456,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1feu clic per a visitar %2</translation> </message> @@ -8737,7 +8735,7 @@ Màxim</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Desconegut</translation> @@ -8994,7 +8992,7 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Ha fallat en analitzar «%s»</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>No s'ha pogut obrir el full d'estil %s</translation> </message> @@ -9045,6 +9043,11 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>pla d'immersió</b> (S'han detectat immersions superposades)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Temps acumulat: %d min.<br></div></translation> @@ -9169,11 +9172,6 @@ Podeu crear aquest fitxer de registre seleccionant la casella de selecció corre <translation>Pla d'immersió</b> creat a</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Temps acumulat: %dmin VARIACIONS<br></div></translation> - </message> - <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Model de descompressió Bühlmann ZHL-16C amb GFBaix = %d%% i GFAlt = %d%%</translation> @@ -9840,6 +9838,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Estat de la immersió</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Immersió a pulmó</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Tots (per estat del viatge)</translation> @@ -9875,97 +9898,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(cap immersió)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Sol</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Dl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Dt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Dc</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Dj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Dv</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Ds</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10341,22 +10364,22 @@ Està connectat correctament el Uemis Zurich?</translation> <translation>Ciutat</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Comença a desar les dades</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Comença a desar les immersions</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>S'ha realitzat la creació del cau local</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>S'està realitzant la preparació per a desar les dades</translation> </message> diff --git a/translations/subsurface_cs.ts b/translations/subsurface_cs.ts index 05ea7c0f4..34d5213ac 100644 --- a/translations/subsurface_cs.ts +++ b/translations/subsurface_cs.ts @@ -326,7 +326,7 @@ <message numerus="yes"> <location filename="../core/checkcloudconnection.cpp" line="58"/> <source>Waiting for cloud connection (%n second(s) passed)</source> - <translation><numerusform>Čeká se na spojení se serverem (uběhla n% sekunda)</numerusform><numerusform>Čeká se na spojení se serverem (uběhlo n% sekund)</numerusform><numerusform>Čeká se na spojení se serverem (uběhlo n% sekund)</numerusform></translation> + <translation><numerusform>Čeká se na spojení se serverem (uběhla %n sekunda)</numerusform><numerusform>Čeká se na spojení se serverem (uběhlo %n sekund)</numerusform><numerusform>Čeká se na spojení se serverem (uběhlo %n sekund)</numerusform></translation> </message> <message> <location filename="../core/checkcloudconnection.cpp" line="65"/> @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknutím sem odeberete tuto lahev.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Změnit hloubku pro dekompresní plyn. Vypočteno s použitím pO₂ pro dekompresi, pokud nebylo nastaveno ručně.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Vypočteno s použitím nastavení pO₂ na dně. Nastavení MOD upravuje O₂ %, nastavte na '*' pro nejlepší O₂ % pro maximální hloubku.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Vypočteno s použitím nastavení Nejlepší směsi END. Nastavení MND upraví He % pro maximální hloubku.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tento plyn je používán. Lze odstranit jen ty lahve, jež nejsou použity při ponoru.</translation> </message> @@ -2051,67 +2059,67 @@ GPS polohu:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Žádný profil k zobrazení</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Lahev:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Zmapovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Hodnocení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Viditelnost:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Zátěž:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -2119,23 +2127,23 @@ GPS polohu:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (lahev %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Ruční přepnutí na OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> začátek</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> konec</translation> @@ -2173,23 +2181,23 @@ GPS polohu:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Seznam potápění</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Přístupové údaje ke cloudu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Ťukněte, prosím, do tlačítka + pro přidání ponoru (nebo stažení ponorů z podporovaného potápěcího počítače)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Žádné ponory v seznamu</translation> </message> @@ -2197,102 +2205,102 @@ GPS polohu:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Rozbalit vše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Sbalit vše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Sbalit ostatní</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Odstranit ponor(y) z výletu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Vytvořit nový výlet výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Přidat ponor(y) k výletu výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Přidat ponor(y) k výletu níže</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Sloučit výlet s výletem výše</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Sloučit výlet s výletem níže</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Smazat ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Označit ponor(y) jako neplatné</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Sloučit vybrané ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Přečíslovat ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Posunout časy ponoru</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Rozdělit vybrané ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Nahrát obrázek(y) ze souboru(ů)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Nahrát obrázek z webu</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Soubory s obrázky (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 se nezdá být obrázkem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Otevřít soubory s obrázky</translation> </message> @@ -2300,12 +2308,12 @@ GPS polohu:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Vytvořit novou potápěčskou lokalitu, zkopírovat významné informace ze současné lokality.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Vytvořit novou potápěčskou lokalitu s tímto názvem</translation> </message> @@ -2965,27 +2973,33 @@ GPS polohu:</translation> <translation>neznámý</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>lahev</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Koncová hloubka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Čas konce</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Délka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Použitý plyn</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3021,112 +3035,107 @@ GPS polohu:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Barva</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Uživatel zadal</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Index lahve</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Tlak S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Tlak I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Strop</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Čidlo 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Čidlo 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Čidlo 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Okolní tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Tepová frekvence</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradientní faktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Průměrná hloubka @ s</translation> </message> @@ -3363,82 +3372,82 @@ p, li { white-space: pre-wrap; } <translation>chyba zápisu zip souboru: %s zip chyba %d systémová chyba %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Hotovo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Nahrává se seznam ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Stahuje se seznam ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Stahování %1 ponorů...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Stahování dokončeno - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problém se stahováním</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Archiv nelze otevřít: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Poškozené stahování</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Archiv se nepodařilo otevřít: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Nahrávání dokončeno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Nahrávání selhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Nahrávání uspěšně dokončeno</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Přihlášení se nezdařilo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Odpověď nelze zpracovat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -3446,33 +3455,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Stáhnout</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Vybrat režim Bluetooth stahování</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Připojování k potápěčskému počítači</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Najít potápěčský počítač Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Zrušit stahování</translation> </message> @@ -3579,7 +3588,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Stáhnout</translation> </message> @@ -3605,7 +3614,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Zrušit</translation> </message> @@ -3620,52 +3629,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth není povolen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Název prodejce: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Potápěčský počítač:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Připojení:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Opakovat</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Ukončit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Stažené ponory</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Přijmout</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Označit vše</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Odznačit vše</translation> </message> @@ -3696,12 +3705,12 @@ p, li { white-space: pre-wrap; } <translation>Připojení na Facebook zástupný text</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Pro odpojení Subsurface od Facebook účtu použijte nabídku „Sdílení“.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Pro připojení k Facebooku se, prosím, přihlašte. Tím Subsurface umožníte vaše ponory zveřejnit na vaší časové ose.</translation> </message> @@ -3709,22 +3718,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Přihlášení Facebooku úspěšné</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Chyba, neznámé uživatelské ID, nelze se přihlásit.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Nahrání ponoru na Facebook úspěšné</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Nahrání ponoru selhalo. Podívejte se prosím na debugovací výstup a zašlete jej do poštovní konference Subsurface</translation> </message> @@ -3975,7 +3984,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Správa potápěčských lokalit</translation> </message> @@ -3997,7 +4006,7 @@ p, li { white-space: pre-wrap; } Jste si jisti, že chcete pokračovat?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Upravujete potápěčskou lokalitu</translation> </message> @@ -4225,12 +4234,12 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Nová potápěčská lokalita</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Zahodit změny?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Chystáte se zahodit změny.</translation> </message> @@ -4289,7 +4298,7 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Otevřít</translation> </message> @@ -4585,13 +4594,13 @@ Jste si jisti, že chcete pokračovat?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Zpět</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Znovu</translation> </message> @@ -4631,58 +4640,63 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Online připojení k serverovému úložišti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Připojit k</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Odpojit od</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Před otevřením nového souboru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Otevřít soubor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Zrušit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Neukládat prázdný log do cloudu</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Procházet adresáře obrázků</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Prohledat</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Prohledávání obrázků... (může trvat delší dobu)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Varování</translation> </message> @@ -4692,105 +4706,105 @@ Jste si jisti, že chcete pokračovat?</translation> <translation>Pokus o sloučení ponorů s %1 min intervalem mezi nimi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Před zavřením souboru přosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Před přidáním ponoru prosím uložte, nebo zrušte nynější úpravy ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Vypsat tabulku koncových časů</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Pokus o přeplánování ponoru, který není plánem ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Před prováděním dalších úprav dokončete stávající úpravy.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Pokus o úpravu ponoru, který není ručně zadaným ponorem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Roční statistiky</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chcete uložit změny provedené v souboru %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chcete uložit změny provedené v souboru s daty?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Uložit změny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Změny budou ztraceny, pokud je neuložíte.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Uložit soubor jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML soubory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[místní vyrovnávací paměť pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[serverové úložiště pro] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Otevírání datového souboru ze starší verze</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otevřeli jste datový soubor starší verze Subsurface. Doporučujeme vám přečíst příručku, abyste zjistili změny v nové verzi, zvláště o správě potápěčských lokalit, která se značně změnila. Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se na systém nové správy potápěčských lokalit a ujistit se, že vše vypadá správně.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Otevřít soubor potápěčského deníku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Soubory potápěčských deníků (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran soubory (*.can *.CAN);;CSV soubory (*.csv *.CSV);;DiveLog.de soubory (*.dld *.DLD);;JDiveLog soubory (*.jlb *.JLB);;Liquivision soubory (*.lvd *.LVD);;MkVI soubory (*.txt *.TXT);;Suunto soubory (*.sde *.db *.SDE *.DB);;Divesoft soubory (*.dlf *.DLF);;UDDF/UDCF soubory (*.uddf *.udcf *.UDDF *.UDCF);;XML soubory (*.xml *.XML);;APD log prohlížeč (*.apd *.APD);;Datatrak/WLog soubory (*.log *.LOG);;OSTCtools soubory (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Všechny soubory (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Spojení se serverovou službou...</translation> </message> @@ -4798,7 +4812,7 @@ Subsurface se pokusil předvyplnit data, ale může být užitečné podívat se <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Upravit vybranou potápěčskou lokalitu</translation> </message> @@ -5115,32 +5129,12 @@ Pokud vaše zařízení používá Bluetooth, udělejte stejné přípravy jako </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Geo vyhledávání potápěčské lokality</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Povolit geokódování pro správu potápěčských lokalit</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Zpracovat lokalitu bez GPS dat</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Stejný formát pro existující ponory</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation>Rozvržení potápěčské lokality</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5444,7 +5438,7 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Serverové úložiště Subsurface</translation> </message> @@ -5525,6 +5519,16 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Serverové úložiště Subsurface (přístupové údaje ověřeny)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5795,28 +5799,28 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importovat soubor šablony</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML soubory (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Exportovat soubory šablon jako</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Tuto akci nelze vrátit!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Smazat šablonu: %1?</translation> </message> @@ -5824,12 +5828,12 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Neznámý potápěčský počítač</translation> </message> @@ -5839,108 +5843,108 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>NDL / TTS nebylo zobrazeno kvůli příliš dlouhému času zpracování</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Přidat změnu plynu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (lahev %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>První potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Plánovaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Ručně přidaný ponor</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Smazat tento potápěčský počítač</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Přidat změnu setpointu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Přidat záložku</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Editovat profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Odstranit událost</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Skrýt podobné události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Upravit název</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Upravit tlak v lahvi %1 (v současnosti interpolován jako %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Zrušit skrytí všech událostí</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Skrýt události</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Skrýt všech %1 událostí?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Odstranit vybranou událost?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Upravit název záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Vlastní název:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Název je příliš dlouhý!</translation> </message> @@ -5948,147 +5952,147 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Spouštění...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Otevřít místní soubor s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Otevřít místní soubor s daty se nepodařilo</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 ponorů nahráno z místního souboru s údaji o ponoru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>režim práce bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Chyba při zpracování místního úložiště. Vzdává se</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>žádné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Prosím zadejte platné přístupové údaje k serveru.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mail a heslo k serverovému úložišti mohou obsahovat pouze písmena, čísla a '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Neplatný formát pro adresy elektronické pošty</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Pokus o otevření serverového úložiště s novými přístupovými údaji</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Zkoušení přístupových údajů k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Žádná odpověď cloudového serveru k ověření přístupových údajů</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Nesprávné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Nelze se připojit k serverovému úložišti - serverový účet neověřen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Neplatné přístupové údaje k serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Nelze otevřít cloudové úložiště: Chyba vytvoření https spojení</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Nelze otevřít serverové úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Nelze se připojit k serverovému úložišti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Přihlašovací údaje k serveru platné. Nahrávají se ponory...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Chyba serverového úložiště: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Nahrávají se ponory s místního úložiště (režim žádný server)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Selhalo připojení ke cloudovému serveru, návrat ke stavu bez serveru</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Serverové úložiště úspěšně otevřeno. Žádné ponory v seznamu.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>s</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Neznámá GPS pozice</translation> </message> @@ -6246,6 +6250,16 @@ Viz http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Špatný formát XML odpovědi. Řádek %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Žádné kategorie rozvržení potápěčské lokality v nastavení!</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Štítky</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6660,64 +6674,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Malé</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Střední</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Datum ponoru: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Doba trvání: %1 min </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Potápěčská lokalita %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6810,12 +6824,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>Pro použití Subsurface-mobile s cloudovým úložištěm Subsurface, zadejte prosím vaše přihlašovací údaje. <br/><br/> Pokud je to poprvé, kdy využíváte serverové úložiště Subsurface, zadejte platný e-mail (malými písmeny) a heslo dle vašeho výběru (písmena a číslice). <br/><br/> Pro použití Subsurface-mobile pouze s lokálními daty na tomto zařízení, vyberte tlačítko "bez cloudu" nahoře.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Děkujeme za registraci k Subsurface. Odeslali jsme <b>%1</b> PIN kód k dokončení registrace. Pokud od nás do 15 minut neobdržíte email, zkontroljte prosím nejdříve správnost vaší emailové adresy a svojí složku se spamem. <br/><br/> V případě jakýchkoliv problémů ohledně nastavení cloudového účtu nás prosím kontaktujte na našem uživatelském fóru (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7439,7 +7453,7 @@ ze vzduchu a následujících plynů:</translation> <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klik k návštěvě %2</translation> </message> @@ -8395,8 +8409,8 @@ Průměr</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8481,15 +8495,15 @@ Průměr</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) nebo (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>vzduch</translation> </message> @@ -8598,7 +8612,7 @@ Průměr</translation> <message> <location filename="../core/git-access.c" line="56"/> <source>Checkout from storage (%lu/%lu)</source> - <translation>Stáhnout z úložiště (%d/%d)</translation> + <translation>Stáhnout z úložiště (%lu/%lu)</translation> </message> <message> <location filename="../core/git-access.c" line="87"/> @@ -8718,7 +8732,7 @@ Průměr</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>neznámý</translation> @@ -8978,7 +8992,7 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>Nepodařilo se zpracovat '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Nelze otevřít styl %s</translation> </message> @@ -8994,21 +9008,21 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Varování:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, efektivně GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>změna setpointu</translation> @@ -9024,195 +9038,211 @@ Tento log soubor můžete vytvořit vybráním odpovídajícího checkboxu v sta <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>potápěčský plán </b> (Nalezeny překrývající se ponory)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Doba běhu: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>Hloubka</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>trvání</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>plyn</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Přechod do %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Přechod do %.*f %s v %d:%02d min - runtime %d:%02u na %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Setrvejte v %.*f %s po %d:%02d min - runtime %d:%02u na %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Změna plynu na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Změna plynu na %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekompresní model: VPM-B se jmenovitým konzervatismem</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Minimum plynu</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>založeno na</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>plán ponoru</b> (povrchový interval</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>vytvořeno</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>plán ponoru</b> vytvořeno</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Doba běhu: %dmin VARIATIONS<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekompresní model: Bühlmann ZHL-16C s GFLow = %d%% a GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekompresní model: VPM-B s konzervatismem +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekompresní model: Rekreační režim založený na Bühlmann ZHL-16B s GFLow = %d%% a GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM tlak: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Spotřeba plynu (mimo CCR etapy):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Spotřeba plynu (založená na SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to je více plynu než je dostupný v dané lahvi!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>nedostatek záložního plynu pro sdílení při výstupu!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum plynu</span> (založeno na %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>vyžadované minimum plynu pro výstup již překročilo počáteční tlak lahví!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s při plánovaném výstupu)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s během plánovaného výstupu) <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u se směsí %s v hloubce %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>nízká hodnota pO₂ %.2f v %d:%02u s plynem %s v hloubce %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Nelze najít směs %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9243,7 +9273,7 @@ D: %.1f%s <location filename="../core/profile.c" line="1338"/> <source>SAC: %.*f%s/min </source> - <translation>SAC: %.*f% s/min + <translation>SAC: %.*f%s/min </translation> </message> <message> @@ -9814,6 +9844,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Status ponoru</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Freedive</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Všechny (dle statistik výletu)</translation> @@ -9849,97 +9904,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(žádné ponory)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Út</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Čt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Pá</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>led</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>úno</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>bře</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>dub</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>kvě</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>čer</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>čec</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>zář</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>říj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>pro</translation> </message> @@ -10169,6 +10224,7 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Délka:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10274,7 +10330,7 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Hloubka</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>plánovaný bod je nad stropem</translation> </message> @@ -10314,22 +10370,22 @@ Je Uemis Zurich správně zapojen?</translation> <translation>Město</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Začít ukládat data</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Začít ukládat ponory</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Vytvoření místní vyrovnávací paměti dokončeno</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Připravuje se uložit data</translation> </message> diff --git a/translations/subsurface_da_DK.ts b/translations/subsurface_da_DK.ts index 3dd7c7cb5..2a8a0aa32 100644 --- a/translations/subsurface_da_DK.ts +++ b/translations/subsurface_da_DK.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1644,7 +1652,7 @@ <source>An error occurred while saving the backup file. %1</source> <translation>Det opstod en fejl under skrivning af backup fil: -%s</translation> +%1</translation> </message> <message> <location filename="../desktop-widgets/configuredivecomputerdialog.cpp" line="1373"/> @@ -1781,27 +1789,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik her vil fjerne flasken</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denne gas er i brug. Kun flasker som ikke bruges i dykket, kan fjernes</translation> </message> @@ -2047,67 +2055,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Dragt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Luft temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Vand temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Vægt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Makker:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Noter</translation> </message> @@ -2115,23 +2123,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manuel skift til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -2169,23 +2177,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2193,102 +2201,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Udvid alt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Skjul alle</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Saml andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Fjern dyk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Opret ny tur over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Tilføj dyk umiddelbart over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Tilføj dyk umiddelbart under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Flet tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Flet tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Slet dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marker dyk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Flet valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Gen-Numerer dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Opdel valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Åben billed filer</translation> </message> @@ -2296,12 +2304,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Opret ny dykker lokation med dette navn</translation> </message> @@ -2961,27 +2969,33 @@ GPS location:</source> <translation>Ukendt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Slut dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Varighed</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Brugt gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3017,112 +3031,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Tryk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Farve</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Bruger tilføjet</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Flaske oversigt</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Tryk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Tryk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Loft</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Omgivende tryk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Hjerte frekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Middel dybde @ s</translation> </message> @@ -3355,81 +3364,81 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Færdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Uploader dyk liste...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Downloader dyk liste...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Downloader %1 dyk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Download færdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem med download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Fejl i download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne i åbnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload færdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload fejlede</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Uploadet med succes</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login fejlede</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan ikke fortolke svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Fejl: %1</translation> </message> @@ -3437,33 +3446,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Fejl</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dykker computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3570,7 +3579,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Download</translation> </message> @@ -3596,7 +3605,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Fortryd</translation> </message> @@ -3611,52 +3620,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Prøv igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3687,12 +3696,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3700,22 +3709,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3966,7 +3975,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3987,7 +3996,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4215,12 +4224,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Drop ændringerne?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du er ved at droppe dine ændringer.</translation> </message> @@ -4279,7 +4288,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Åben</translation> </message> @@ -4575,13 +4584,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Fortryd</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4621,58 +4630,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Gem eller fortryd venligst det aktuelle dyk før du åbner en ny fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Åben fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Fortryd</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Skan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Skanner billeder...(dette kan tage noget tid)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4682,104 +4696,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Gem eller fortryd venligst denne rettelse før du lukker filen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Gem eller fortryd venligst dette dyk før du tilføjer et dyk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Print runtime skema</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Færdiggør denne rettelse inden du starter på en ny.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Årlig statistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du gemme ændringerne du foretog på denne fil %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du gemme ændringerne du foretog på data filen?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Gem ændringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Ændringer vil blive tabt hvis du ikke gemmer dem.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Gem fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Åben log fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4787,7 +4801,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5102,32 +5116,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Samme format som eksisterende dyk</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Dykker lokation layout</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5429,7 +5423,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5510,6 +5504,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5780,28 +5784,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importer skabelon fil</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML filer (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Eksporter skabelon filer som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Denne handling kan ikke fortrydes!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Slet skabelon: %1?</translation> </message> @@ -5809,12 +5813,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 af %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Ukendt dykker computer</translation> </message> @@ -5824,108 +5828,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Vis NDL / TTS blev slået fra, da det tog for lang tid at danne den.</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Tilføj gas skift</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Flaske %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Tilføj bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Rediger profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Slet hændelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Skjul tilsvarende hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Vis alle hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Skjul hændelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Fjern de valgte hændelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Rediger bogmærke navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Brugerdefineret navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Navn er for langt!</translation> </message> @@ -5933,147 +5937,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6231,6 +6235,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Ugyldig XML svar. Linje %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tags</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6643,63 +6657,63 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dykker dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varighed: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dykker lokation: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Makker: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6792,12 +6806,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7422,7 +7436,7 @@ blandes fra Luft ved brug: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8372,8 +8386,8 @@ Gennemsnit</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>ilt</translation> </message> @@ -8458,15 +8472,15 @@ Gennemsnit</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>luft</translation> </message> @@ -8695,7 +8709,7 @@ Gennemsnit</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Ukendt</translation> @@ -8951,7 +8965,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fejl i fortolkning af '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åbne stylesheet %s</translation> </message> @@ -8967,21 +8981,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8997,195 +9011,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>varighed</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s i %d:%02d min - runtime %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stop på %.*f %s i %d:%02d min - runtime %d:%02u på %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stop på %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Skift gas til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Skift gas til %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas forbrug (CCR etaper udeladt)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det er mere gas end der er tilrådighed i flasken!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Ikke ekstra gas nok til deling ved opstigning</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høj pO₂ værdi %.2f at %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ værdi %.2f på %d:%02u med gas %s på dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Kan ikke finde gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9773,6 +9803,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dykkerstatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9808,97 +9863,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ingen dyk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Søn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Man</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Tir</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Ons</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Tor</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Fre</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Lør</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10123,6 +10178,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Varighed:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min.</translation> @@ -10228,7 +10284,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Dybde</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10268,22 +10324,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_de_CH.ts b/translations/subsurface_de_CH.ts index 15821efce..19e87c69f 100644 --- a/translations/subsurface_de_CH.ts +++ b/translations/subsurface_de_CH.ts @@ -377,6 +377,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Tiefe für Gaswechsel, berechnet mittels Deko-pO₂ Voreinstellung, falls nicht explizit gesetzt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Berechnet mittels pO₂ Voreinstellung. Setzen der MOD verändert O₂%. '*' als Wert wählt Best Mix O₂% bei maximaler Tiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Berechnet mittels Best Mix END Voreinstellung. Setzen der MND verändert He%, '*' als Wert verwendet besten He-Anteil bei Maximaltiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -2051,67 +2059,67 @@ Position verwenden</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Kein Profil vorhanden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Anzug:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Lufttemp.:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Flasche:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Wassertemp : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Bewertung:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notizen</translation> </message> @@ -2119,23 +2127,23 @@ Position verwenden</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (Fl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manuelles umschalten auf OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> Anfang</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> Ende</translation> @@ -2173,23 +2181,23 @@ Position verwenden</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Tauchgangliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Cloud Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Keine Tauchgänge in der Tauchgangsliste.</translation> </message> @@ -2197,102 +2205,102 @@ Position verwenden</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Entferne Tauchgäng(e) aus Reise</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Tauchzeiten verschieben</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Ausgewählte Tauchgänge splitten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Bilde(r) von Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Bild aus Web laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 scheint kein Bild zu sein</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> @@ -2300,12 +2308,12 @@ Position verwenden</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Einen neuen Tauchplatz, basierend auf den Daten des aktuellen Tauchplatz, erstellen.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Neuer Tauchplatz mit diesem Name anlegen</translation> </message> @@ -2965,27 +2973,33 @@ Position verwenden</translation> <translation>unbekannt</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Endtiefe</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gasverbrauch</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC Sollwert</translation> </message> @@ -3021,112 +3035,107 @@ Position verwenden</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Zeit</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Druck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Farbe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Benutzer Eingabe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Flaschen Index</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Druck S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Druck I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Tiefster Deko-Stopp</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Einstellwert</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Umgebungsdruck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Pulsrate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradientenfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Mittlere Tiefe @ s</translation> </message> @@ -3363,82 +3372,82 @@ p, li { white-space: pre-wrap; } <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Fertig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Liste der Tauchgänge wird hochgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Probleme beim Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Das Archiv konnte nicht geöffnet werden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Hochladen abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Hochladen fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Hochladen erfolgreich</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> @@ -3446,33 +3455,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Wählen Sie den Bluetooth download Modus</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Fehler</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Finde Uemis Tauchcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Herunterladen abbrechen</translation> </message> @@ -3579,7 +3588,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Herunterladen</translation> </message> @@ -3605,7 +3614,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> @@ -3620,52 +3629,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Hersteller:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Tauchcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Wiederholen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Beenden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Ausgelesene Tauchgänge</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3696,12 +3705,12 @@ p, li { white-space: pre-wrap; } <translation>Verbinden mit Facebook Text Platzhalter</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Damit ist es möglich, Tauchgänge auf Facebook zu posten.</translation> </message> @@ -3709,22 +3718,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3975,7 +3984,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Tauchplatzverwaltung</translation> </message> @@ -3997,7 +4006,7 @@ p, li { white-space: pre-wrap; } Möchtest Du fortfahren?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Du bearbeitest einen Tauchplatz</translation> </message> @@ -4225,12 +4234,12 @@ Möchtest Du fortfahren?</translation> <translation>Neuer Tauchplatz</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Änderungen verwerfen?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du bist im Begriff, die Änderungen zu Verwerfen.</translation> </message> @@ -4289,7 +4298,7 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -4585,13 +4594,13 @@ Möchtest Du fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>R&ueckgängig</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Wiederholen</translation> </message> @@ -4631,58 +4640,63 @@ Möchtest Du fortfahren?</translation> <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Bilder Verzeichnisse durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Durchsuche Bilder...(dies kann eine Weile dauern)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4692,105 +4706,105 @@ Möchtest Du fortfahren?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Laufzeittabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschliessen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Versuche einenTauchgang zu bearbeiten der nicht manuell angelegt wurde.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Du Deine Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[Cloud Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Tauchprotokolldatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Logbuchdateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de Dateien (*.dld *.DLD);;JDiveLog Dateien (*.jlb *.JLB);;Liquivision Dateien (*.lvd *.LVD);;MkVI Dateien (*.txt *.TXT);;Suunto Dateien (*.sde *.db *.SDE *.DB);;Divesoft Dateien (*.dlf *.DLF);;UDDF/UDCF Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML Dateien (*.xml *.XML);;APD log Betrachter (*.apd *.APD);;Datatrak/WLog Dateien (*.log *.LOG);;OSTCtools Dateien (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle Dateien (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Kontaktiere Cloud Service...</translation> </message> @@ -4798,7 +4812,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5115,32 +5129,12 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Tauchplatz Geo-Koordinaten suche</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Geo-Koordinaten für Tauchplatz Verwaltung einschalten</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Platz ohne GPS-Daten lesen</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Gleiches Format für vorhandene Tauchgänge</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Tauchplatz Vorlage</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5444,7 +5438,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface Cloud Speicher</translation> </message> @@ -5525,6 +5519,16 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface Cloud Speicher (Zugriffsdaten überprüft)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5795,28 +5799,28 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Importieren</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Vorlagendatei importieren</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML Dateien (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Vorlagendateien exportieren als</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Diese Aktion kann nicht rückgängig gemacht werden!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Vorlage löschen: %1?</translation> </message> @@ -5824,12 +5828,12 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 von %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Unbekannter Tauchcomputer</translation> </message> @@ -5839,108 +5843,108 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -5948,147 +5952,147 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>ohne Cloud-Anbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Keine Cloud-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Bitte gültige Cloud-Benutzerdaten eingeben.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud Email und Passwörter können nur Buchstaben, Zahlen und folgende Sonderzeichen enthalten . - _ + </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Versuche Cloud mit neuen Benutzerdaten zu öffnen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Überprüfe Could-Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Keine Antwort vom Cloud-Server zur Überprüfung der Benutzerdaten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Keine Verbindung zum Cloud-Server - Cloud-Account nicht bestätigt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Cloud-Benutzerdaten ungültig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kann den Cloud-Speicher nicht öffnen: Fehler beim Erstellen der https-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Kann den Cloud-Speicher nicht öffnen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Kann nicht zum Cloud-Speicher verbinden</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Cloud-Speicher-Fehler: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Verbindung zum Cloud-Server fehlgeschlagen, Fortsetzung ohne Cloud-Verbindung</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloudspeicher erfolgreich geöffnet. Keine Tauchgänge in der Tauchgangsliste.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Unbekannte GPS-Position</translation> </message> @@ -6246,6 +6250,16 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Ungültige XML Antwort. Zeile %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Stichwörter</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6659,64 +6673,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Tauchdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Dauer: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Tauchplatz: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Tauchgruppenleiter: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6809,12 +6823,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7439,7 +7453,7 @@ den folgenden Gasen gemischt werden: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1 klicken, um zu %2 gehen</translation> </message> @@ -8393,8 +8407,8 @@ Durchschnitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>Sauerstoff</translation> </message> @@ -8479,15 +8493,15 @@ Durchschnitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) oder (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>Luft</translation> </message> @@ -8716,7 +8730,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unbekannt</translation> @@ -8974,7 +8988,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -8990,21 +9004,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Warnung:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effektive GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Setpoint-Änderung</translation> @@ -9020,195 +9034,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>Tiefe</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>Dauer</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>Laufzeit</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>Gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Auf-/Abstieg bis %.*f %s in %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Aufstieg auf %.*f %s in %d:%02d min - Laufzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Auf %.*f %s bleiben für %d:%02d min - Runtime %d:%02u mit %s (Setpoint = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Verbleibe auf %.*f %s für %d:%02d min - Gesamtzeit %d:%02u mit %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Wechsle Gas auf %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Gaswechsel zu %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomodell: VPM-B ohne Konservatismus</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>Plan</b> (Oberflächenpause</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>erstellt am</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>Plan</b> erstellt am</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomodell: VPM-B mit Konservatismus +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Sporttauchmodus basierend auf Bühlmann ZHL-16B mit GF niedrig = %d%% und GF hoch = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Oberflächendruck: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbrauch (ohne CCR Segmente):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gasverbrauch (basierend auf SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Dies ist mehr Gas, als in der Flasche verfügbar ist!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Keine ausreichende Reserve für Aufstieg unter Wechselatmung!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>Erforderliches Minimum Gas überschreitet bereits den Anfangsdruck der Flasche!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s von <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s im berechneten Aufstieg)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s im berechneten Aufstieg) von <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoher pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>niedriger pO₂ Wert %.2f auf %d:%02u mit Gas %s in Tiefe %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Kann Gas %s nicht finden</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9805,6 +9835,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Tauchstatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Freitauchgang</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alle (nach Reisen)</translation> @@ -9840,97 +9895,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10160,6 +10215,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Dauer:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10265,7 +10321,7 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Tiefe</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>Wegpunkt verletzt Dekoschranke</translation> </message> @@ -10305,22 +10361,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Stadt</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_de_DE.ts b/translations/subsurface_de_DE.ts index 684485132..0d8cf7ed7 100644 --- a/translations/subsurface_de_DE.ts +++ b/translations/subsurface_de_DE.ts @@ -377,6 +377,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1784,27 +1792,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Hier klicken entfernt diese Flasche.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="272"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Tiefe für Gaswechsel, berechnet mittels Deko-pO₂ Voreinstellung, falls nicht explizit gesetzt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Berechnet mittels pO₂ Voreinstellung. Setzen der MOD verändert O₂%. '*' als Wert wählt Best Mix O₂% bei maximaler Tiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Berechnet mittels Best Mix END Voreinstellung. Setzen der MND verändert He%, '*' als Wert verwendet besten He-Anteil bei Maximaltiefe.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="258"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dieses Gas wird verwendet. Nur Flaschen die nicht im Tauchgang verwendet werden können entfernt werden.</translation> </message> @@ -2172,23 +2180,23 @@ Position verwenden</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Tauchgangsliste</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Cloud-Anmeldedaten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Bitte tippe den '+' Knopf, um einen Tauchgang hinzuzufügen (oder lade Tauchgänge von einem unterstützten Tauchcomputer</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Keine Tauchgänge in der Tauchgangsliste.</translation> </message> @@ -2196,102 +2204,102 @@ Position verwenden</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Alle ausfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Alle einfalten</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Andere einklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Tauchgäng(e) aus Reise entfernen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Neue Reise darüber einfügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Tauchgäng(e) zur Reise darüber hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Tauchgäng(e) zur Reise darunter hinzufügen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Reise mit der darüber verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Reise mit der darunter verbinden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Tauchgäng(e) löschen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Tauchgäng(e) als ungültig markieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Ausgewählte Tauchgänge zusammenführen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Tauchgänge neu nummerieren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Tauchzeiten verschieben</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Ausgewählte Tauchgänge aufteilen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Bild(er) aus Datei(en) laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Bild aus Web laden</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Bilddateien (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 scheint kein Bild zu sein</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Öffne Bilddateien</translation> </message> @@ -3363,82 +3371,82 @@ p, li { white-space: pre-wrap; } <translation>Fehler beim Schreiben der ZIP-Datei: %s ZIP-Fehler %d Systemfehler %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Fertig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Liste der Tauchgänge wird hochgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Liste der Tauchgänge herunterladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Lade %1 Tauchgänge vom Server...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Herunterladen beendet - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem beim Herunterladen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Das Archiv konnte nicht geöffnet werden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Heruntergeladene Daten sind beschädigt.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Das Archiv konnte nicht geöffnet werden %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Hochladen abgeschlossen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Hochladen fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Hochladen erfolgreich</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Anmeldung fehlgeschlagen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Verstehe die Antwort nicht</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Fehler: %1</translation> </message> @@ -3655,17 +3663,17 @@ p, li { white-space: pre-wrap; } <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Annehmen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Alles auswählen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Alle abwählen</translation> </message> @@ -3696,12 +3704,12 @@ p, li { white-space: pre-wrap; } <translation>Mit Facebook verbinden Platzhalter</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Die Facebook-Verbindung kann mit dem "Teilen" Menüeintrag beendet werden.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Um Subsurface mit Facebook zu verbinden, bitte einloggen. Dadurch ist es möglich, Tauchgänge auf Facebook zu posten.</translation> </message> @@ -3709,22 +3717,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Facebook erfolgreich angemeldet</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Fehler, unbekannte Benutzerkennung, Anmeldung nicht möglich.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Tauchgang erfolgreich auf Facebook hochgeladen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Hochladen der Tauchgänge fehlgeschlagen. Bitte Fehlerausgabe prüfen und an die Subsurface Mailingliste senden!</translation> </message> @@ -4289,7 +4297,7 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Öffnen</translation> </message> @@ -4585,13 +4593,13 @@ Trotzdem fortfahren?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Rückgängig</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Wiederherstellen</translation> </message> @@ -4631,63 +4639,63 @@ Trotzdem fortfahren?</translation> <translation>Verbinden zum Cloud-Dienst</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Verbinden mit</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Trennen von</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor eine neue Datei geöffnet wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Datei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Abbrechen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> <source>Don't save an empty log to the cloud</source> <translation>Kein leeres Logbuch in der Cloud speichern</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Bildverzeichnisse durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Durchsuchen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Bilder werden gesucht...(dies kann eine Weile dauern)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Warnung</translation> </message> @@ -4697,100 +4705,100 @@ Trotzdem fortfahren?</translation> <translation>Es wird versucht, Tauchgänge mit %1min Oberflächenpause zusammenzuführen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor die Datei geschlossen wird.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bitte den aktuell bearbeiteten Tauchgang speichern oder den Vorgang abbrechen, bevor ein neuer Tauchgang hinzugefügt werden kann.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Runtimetabelle anzeigen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Es wird versucht, einen Tauchgang, der ursprünglich nicht im Planer erstellt wurde, im Planer zu öffnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Bitte zuerst die aktuelle Bearbeitung abschließen um eine neue zu beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Es wird versucht, einen nicht Tauchgang, der nicht manuell erstellt wurde, zu editieren.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Jahresstatistiken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Möchtest Du die Änderungen in der Datei %1 speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Möchtest Sie Ihre Änderungen in der Datendatei speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Änderungen speichern?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Änderungen gehen verloren, wenn Du sie nicht speicherst.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Datei speichern unter</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML Dateien (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[Lokaler Zwischenspeicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[Cloud-Speicher für] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Datendatei von älterer Version wird geöffnet</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Es wurde eine Datei von einer älteren Subsurface-Version geöffnet. Wir empfehlen das Handbuch zu lesen, um die Unterschiede der neuen Version insbesondere in der Tauchplatzverwaltung kennen zu lernen. Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die neue Tauchplatzverwaltung anzuschauen und sicher zu stellen, dass alles richtig aussieht. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Logbuchdatei öffnen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Logbuchdateien (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de Dateien (*.dld *.DLD);;JDiveLog Dateien (*.jlb *.JLB);;Liquivision Dateien (*.lvd *.LVD);;MkVI Dateien (*.txt *.TXT);;Suunto Dateien (*.sde *.db *.SDE *.DB);;Divesoft Dateien (*.dlf *.DLF);;UDDF/UDCF Dateien (*.uddf *.udcf *.UDDF *.UDCF);;XML Dateien (*.xml *.XML);;APD log Betrachter (*.apd *.APD);;Datatrak/WLog Dateien (*.log *.LOG);;OSTCtools Dateien (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle Dateien (*)</translation> </message> @@ -4803,7 +4811,7 @@ Subsurface hat bereits versucht, Daten einzutragen, aber es empfiehlt sich, die <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Ziehe den ausgewählten Tauchplatz</translation> </message> @@ -5121,32 +5129,12 @@ Wenn es sich um ein Bluetooth-Gerät handelt, bitte die gleichen Vorbereitungen </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Standortbestimmung </translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Geokodierung für Tauchplatzverwaltung aktivieren</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Platz ohne GPS-Daten lesen</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Gleiches Format für vorhandene Tauchgänge</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> <source>Dive site layout</source> <translation>Tauchplatzangaben</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5450,7 +5438,7 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface-Cloud-Speicher</translation> </message> @@ -5531,6 +5519,16 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface-Cloud-Speicher (Anmeldedaten bestätigt)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5845,17 +5843,17 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Null-/Auftauchzeitberechnung wegen Zeitüberschreitung abgebrochen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Gaswechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Als ersten Tauchcomputer setzen</translation> </message> @@ -5870,83 +5868,83 @@ siehe http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Manuell hinzugefügter Tauchgang</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Diesen Tauchcomputer entfernen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>CC Setpoint-Wechsel setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Markierung setzen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Profil bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Entferne Ereignis</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Ähnliche Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Name bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Druck in Flasche %1 (momentan zu %2 interpoliert)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Alle Ereignisse einblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ereignisse ausblenden</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Alle %1 Ereignisse ausblenden?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Ausgewähltes Ereignis entfernen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Name der Markierung bearbeiten</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Benutzerdefinierter Name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Der Name ist zu lang!</translation> </message> @@ -6676,64 +6674,64 @@ Dateien mit unpassendem Datum/Zeit</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Klein</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mittel</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Tauchdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Dauer: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Tauchplatz: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Tauchgruppenleiter: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7456,7 +7454,7 @@ den folgenden Gasen gemischt werden: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klicken, um zu %2 gehen</translation> </message> @@ -8735,7 +8733,7 @@ Durchschnitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unbekannt</translation> @@ -8995,7 +8993,7 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Fehler beim Lesen von '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kann Stylesheet %s nicht öffnen</translation> </message> @@ -9046,6 +9044,11 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Plan</b> (Überlappende Tauchgänge erkannt)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9170,11 +9173,6 @@ Die kann durch Setzen einen Häkchens im Download-Dialog erstellt werden.</trans <translation>Plan</b> erstellt am</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIATIONS<br></div></translation> - </message> - <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C mit GF niedrig = %d%% und GF hoch = %d%%</translation> @@ -9847,6 +9845,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Tauchstatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Freitauchgang</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alle (nach Reisen)</translation> @@ -9882,97 +9905,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(keine Tauchgänge)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>So</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Mo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Fr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mär</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10348,22 +10371,22 @@ Ist der Uemis Zürich korrekt verbunden?</translation> <translation>Großstadt</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Beginne Datenspeicherung</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Beginne Tauchgänge zu speichern</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Lokaler Zwischenspeicher erzeugt</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Bereite Datenspeicherung vor</translation> </message> diff --git a/translations/subsurface_el_GR.ts b/translations/subsurface_el_GR.ts index 906936b82..14dd9d243 100644 --- a/translations/subsurface_el_GR.ts +++ b/translations/subsurface_el_GR.ts @@ -377,6 +377,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1782,27 +1790,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Πατώντας εδώ θα διαγραφεί αυτή η φιάλη</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Βάθος αλλαγής σε μείγμα αποσυμπίεσης. Υπολογίστηκε χρησιμοποιώντας την pO₂ του μείγματος αποσυμπίεσης, εκτός αν ορίστηκε μη αυτόματα.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Αυτό το μείγμα χρησιμοποιείται. Μόνο φιάλες που δεν χρησιμοποιούνται στην κατάδυση μπορούν να διαγραφούν.</translation> </message> @@ -2047,67 +2055,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Δεν υπάρχει γράφημα για προβολή</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Στολή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Θερμοκρασία Ατμόσφαιρας:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Φιάλη:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Θερμοκρασία Νερού:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Βαθμός:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Βάρος:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Καταδυτικό ζευγάρι:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Σημειώσεις:</translation> </message> @@ -2115,23 +2123,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(φιάλη %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Μη αυτόματη μετάπτωση σε ανοικτό κύκλωμα </translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>έναρξη</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>λήξη</translation> @@ -2169,23 +2177,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Κατάλογος καταδύσεων</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων</translation> </message> @@ -2193,102 +2201,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Επέκταση όλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Σύμπτυξη όλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Σύμπτυξη των άλλων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Αφαίρεση κατάδυσης(-σεων) από το ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Δημιουργία νέου ταξιδιού από πάνω</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Προσθήκη κατάδυσης(σεων) στο αμέσως πιο πάνω ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Προσθήκη κατάδυσης(σεων) στο αμέσως πιο κάτω ταξίδι </translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Συγχώνευση με το από πάνω ταξίδι</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Συγχώνευση με το από κάτω ταξίδι.</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Διαγραφή κατάδυσης(-σεων)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Επισημάνετε την(ις) κατάδυση(σεις) ως άκυρη(ες)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Συγχώνευση επιλεγμένων καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Αλλαγή αρίθμησης κατάδυσης(-σεων) </translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Μετακίνηση χρόνων κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Διαχωρισμός επιλεγμένων καταδύσεων</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Φόρτωση εικόνας(-ων) από αρχείο(-α)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Φόρτωση εικόνας από το διαδίκτυο</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>το %1 δεν φαίνεται να είναι εικόνα</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Άνοιγμα αρχείων εικόνων</translation> </message> @@ -2296,12 +2304,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Δημιουργία μίας νέας θέσης κατάδυσης, αντιγράφοντας τις σχετικές πληροφορίες από την τρέχουσα κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Δημιουργία νέας θέσης κατάδυσης με αυτό το όνομα </translation> </message> @@ -2961,27 +2969,33 @@ GPS location:</source> <translation>άγνωστο</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Τελικό Βάθος</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Χρόνος από την έναρξη της κατάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Διάρκεια</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Μείγμα χρήσης</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>Καθορισμένη Τιμή Κλειστού Κυκλώματος</translation> </message> @@ -3017,112 +3031,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Βάθος</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Ώρα</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Πίεση</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Θερμοκρασία</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Χρώμα</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Εισαγωγή από χρήστη</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Ευρετήριο φιάλης</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Πίεση S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Πίεση I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Βάθος ασφαλούς ανάδυσης</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Καθορισμένη Τιμή</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Αισθητήρας 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Αισθητήρας 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Αισθητήρας 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Πίεση περιβάλλοντος</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Καρδιακοί παλμοί</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Αναλογικός συντελεστής αποσυμπίεσης</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Μέσος όρος βάθους @ s</translation> </message> @@ -3298,7 +3307,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../qt-models/divetripmodel.cpp" line="548"/> <source>Weight(%1)</source> - <translation>Βάρος(%1%2)</translation> + <translation>Βάρος(%1)</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="548"/> @@ -3341,7 +3350,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="187"/> <source>failed to create zip file for upload: %s</source> - <translation>αποτυχία δημιουργίας συμπιεσμένου αρχείου για μεταφόρτωση: %1</translation> + <translation>αποτυχία δημιουργίας συμπιεσμένου αρχείου για μεταφόρτωση: %s</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="251"/> @@ -3359,81 +3368,81 @@ p, li { white-space: pre-wrap; } <translation>σφάλμα εγγραφής συμπιεσμένου αρχείου: %s σφάλμα συμπίεσης %d σφάλμα συστήματος %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Μεταφόρτωση λίστας καταδύσεων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Λήψη λίστας καταδύσεων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Λήψη %1 καταδύσων...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Η λήψη τελείωσε - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Πρόβλημα με την λήψη</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Το αρχείο αυτό δεν μπόρεσε να ανοιχθεί</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Κατεστραμμένη λήψη</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Το αρχείο αυτό δεν μπορούσε να ανοιχθεί: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Η μεταφόρτωση τελείωσε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Η μεταφόρτωση απέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Η μεταφόρτωση πέτυχε</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Δεν μπορεί να αναλυθεί η απάντηση </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Σφάλμα: %1</translation> </message> @@ -3441,33 +3450,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Λήψη</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Επιλέξτε τρόπο λήψης πρωτοκόλλου Bluetooth </translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Σφάλμα</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Εύρεση καταδυτικού υπολογιστή UEMIS</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3574,7 +3583,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Λήψη</translation> </message> @@ -3600,7 +3609,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> @@ -3615,52 +3624,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Επωνυμία προμηθευτή:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Καταδυτικός υπολογιστής:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Επαναπροσπάθεια</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Παραίτηση</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Ληφθείσες καταδύσεις</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Αποδοχή</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Επιλογή όλων</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Αποεπιλογή Όλων</translation> </message> @@ -3691,12 +3700,12 @@ p, li { white-space: pre-wrap; } <translation>Σύνδεση με το κείμενο δοκιμής του Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Για να αποσυνδέσετε το Subsurface από τον λογαριασμό σας στο Facebook, χρησιμοποιήστε την επιλογή του καταλόγου 'Κοινοποίηση'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Για να συνδεθείτε με το Facebook, παρακαλώ εισάγεται τα διαπιστευτήριά σας. Αυτό επιτρέπει στο Subsurface να δημοσιεύσει καταδύσεις στο χρονολόγιό σας</translation> </message> @@ -3704,22 +3713,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3970,7 +3979,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Διαχείριση θέσης κατάδυσης</translation> </message> @@ -3992,7 +4001,7 @@ p, li { white-space: pre-wrap; } Είστε βέβαιος ότι θέλετε να συνεχίσεται; </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Επεξεργάζεστε μία θέση κατάδυσης </translation> </message> @@ -4220,12 +4229,12 @@ p, li { white-space: pre-wrap; } <translation>Νέα θέση κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Απόρριψη των αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Πρόκειται να απορρίψετε τις αλλαγές σας. </translation> </message> @@ -4284,7 +4293,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Άνοιγμα</translation> </message> @@ -4580,13 +4589,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Αναίρεση</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Άρση αναίρεσης</translation> </message> @@ -4626,58 +4635,63 @@ p, li { white-space: pre-wrap; } <translation>Θέση του αποθηκευτικού νέφους σε σύνδεση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Σύνδεση με</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Αποσύνδεση από</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν ανοίξετε ένα νέο αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Άνοιγμα αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Ακύρωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Εξερεύνηση αρχείων εικόνων</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Σάρωση</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Σάρωση εικόνων...(αυτή η ενέργεια μπορεί να καθυστερήσει) </translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Προειδοποίηση</translation> </message> @@ -4687,105 +4701,105 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν κλέισετε το αρχείο.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Παρακάλω αποθηκεύστε ή ακυρώστε την επεξεργασία της κατάδυσης πριν προσπαθήσετε να προσθέσετε μια κατάδυση.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Εκτύπωση πίνακα ολικού χρόνου κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Προσπάθεια να επανασχεδιαστεί μία κατάδυση που δεν ήταν μια σχεδιασμένη κατάδυση. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Παρακαλώ πρώτα τελειώστε την τρέχουσα επεξεργασία πριν προσπαθήσετε να επεξεργαστείτε εκ νέου. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Προσπάθεια επεξεργασίας μια κατάδυσης που δεν προστέθηκε με μη αυτόματο τρόπο. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Ετήσια στατιστικά στοιχεία</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Θέλετε να αποθηκευτούν οι αλλαγές στο αρχείο %1;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Θέλετε να αποθηκευθούν οι αλλαγές στο αρχείο δεδομένων;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Αποθήκευση αλλαγών;</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Οι αλλαγές θα χαθούν αν δεν τις αποθηκεύσετε.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Αποθήκευση αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[τοπική κρυφή μνήμη για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[αποθήκευση στο αποθηκευτικό νέφος για] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Άνοιγμα αρχείου δεδομένων από παλαιότερη έκδοση </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Ανοίξατε ένα αρχείο δεδομένων μίας παλαιότερης έκδοσης του Subsurface. Προτείνεται να συμβουλευτείτε το εγχειρίδιο χρήσης για να μάθετε για τις διαφοροποιήσεις της καινούργιας έκδοσης, ιδιαίτερα στην διαχείριση των καταδυτικών θέσεων η οποία έχει αλλάξει σε μεγάλο βαθμό. Το Subsurface ήδη επιχείρησε να συμπληρώσει τα δεδομένα, αλλά προτείνεται να αφιερώσετε κάποιο χρόνο στο νέο σύστημα διαχείρισης των καταδυτικών θέσεων και να βεβαιωθείτε ότι όλα είναι σωστά.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Άνοιγμα αρχείου καταγραφής κατάδυσης</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Αρχεία καταγραφής κατάδυσης (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Αρχεία Cochran (*.can *.CAN);;Αρχεία CSV (*.csv *.CSV);;Αρχεία DiveLog.de (*.dld *.DLD);;Αρχεία JDiveLog (*.jlb *.JLB);;Αρχεία Liquivision (*.lvd *.LVD);;Αρχεία MkVI (*.txt *.TXT);;Αρχεία Suunto (*.sde *.db *.SDE *.DB);;Αρχεία Divesoft (*.dlf *.DLF);;Αρχεία UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Αρχεία XML (*.xml *.XML);;Προβολέας αρχείων καταγραφής APD (*.apd *.APD);;Αρχεία Datatrak/WLog (*.log *.LOG);;Αρχεία OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Όλα τα αρχεία (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Επικοινωνία με την υπηρεσία αποθηκευτικού νέφους... </translation> </message> @@ -4793,7 +4807,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5110,32 +5124,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Γεωεύρεση θέσης κατάδυσης</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Ενεργοποίηση διαδικασίας εύρεσης συντεταγμένων για διαχείριση θέσης κατάδυσης</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Ανάλυση θέσης κατάδυσης χωρίς δεδομένα GPS </translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Ίδια μορφή για τις υπάρχουσες καταδύσεις </translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Διάταξη θέσης κατάδυσης </translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5439,7 +5433,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Αποθήκευση νέφους Subsurface</translation> </message> @@ -5520,6 +5514,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Αποθήκευση νέφους Subsurface (τα διαπιστευτήρια εξακριβώθηκαν) </translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5790,28 +5794,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Εισαγωγή</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Εισαγωγή πρότυπου αρχείου</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>Αρχεία HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Εξαγωγή πρότυπου αρχείου ως</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Αυτή η πράξη δεν μπορεί να αναιρεθεί!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Διαγραφή πρότυπου: %1;</translation> </message> @@ -5819,12 +5823,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation>(#%1 από %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Άγνωστος καταδυτικός υπολογιστής</translation> </message> @@ -5834,108 +5838,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Η εμφάνιση του Ορίου Μη Αποσυμπίεσης / Συνολικού Χρόνου Μέχρι την Επιφάνεια, απενεργοποιήθηκε λόγω υπέρμετρου χρόνου επεξεργασίας</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Προσθήκη αλλαγής μείγματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Φιάλη %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Προσθήκη σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Επεξεργασία του γραφήματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Αφαίρεση συμβάντος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Απόκρυψη παρόμοιων συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Επεξεργασία ονόματος</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ρύθμιση πίεσης της φιάλης %1 (προς το παρόν έχει υπολογιστεί με παρεμβολή ως %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Απόκρυψη όλων των συμβάντων</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Απόκρυψη όλων των %1 συμβάντων;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Διαγραφή του επιλεγμένου συμβάντος;</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Επεξεργασία ονόματος σελιδοδείκτη</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Ειδικό όνομα:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Το όνομα είναι πολύ μεγάλο! </translation> </message> @@ -5943,147 +5947,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Έναρξη...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>εργασία εκτός αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Δεν υπάρχουν διαπιστευτήρια νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Παρακαλώ εισάγετε έγκυρα διαπιστευτήρια νέφους </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Η διεύθυνση ηλεκτρονικού ταχυδρομείου και το συνθηματικό του αποθηκευτικού νέφους μπορεί να περιλαμβάνει μόνο γράμματα, αριθμούς και '.', '-', '_', και '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Προσπάθεια ανοίγματος αποθήκευσης νέφους με νέα διαπιστευτήρια </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Έλεγχος διαπιστευτηρίων νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Καμία απόκριση από τον διαμεσολαβητή του αποθηκευτικού νέφους για έλεγχο εγκυρότητας των διαπιστευτηρίων </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος - ο λογαριασμός αποθηκευτικού νέφους δεν έχει επιβεβαιωθεί </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Λανθασμένα διαπιστευτήρια αποθηκευτικού νέφους</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: Σφάλμα στη δημιουργία συνδέσεων https </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Δεν μπορεί να ανοιχθεί το αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Δεν μπορεί να συνδεθεί με το αποθηκευτικό νέφος</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Σφάλμα αποθήκευσης στο αποθηκευτικό νέφος: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Αποτυχία σύνδεσης με τον διακομιστή του αποθηκευτικού νέφους, επαναφορά σε καθεστώς λειτουργίας χωρίς αποθηκευτικό νέφος </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Το αποθηκευτικό νέφος ανοίχθηκε με επιτυχία. Δεν υπάρχουν καταδύσεις στον κατάλογο καταδύσεων. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>ώρα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>δευτερόλεπτα</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Άγνωστη θέση GPS</translation> </message> @@ -6241,6 +6245,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Παραμορφωμένη απάντηση XML. Γραμμή %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Ετικέτες</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6655,64 +6669,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Μέσο</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Καταδυτικά δεδομένα: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Διάρκεια: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ώρα</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Τοποθεσία κατάδυσης: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Καταδυτικό ζευγάρι: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6805,12 +6819,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7434,7 +7448,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1πιέστε για να επισκεφθείτε %2</translation> </message> @@ -7517,7 +7531,7 @@ mixed from Air and using: <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> <source>Weight(%1)</source> - <translation>Βάρος(%1%2)</translation> + <translation>Βάρος(%1)</translation> </message> <message> <location filename="../qt-models/divetripmodel.cpp" line="246"/> @@ -8387,8 +8401,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>οξυγόνο</translation> </message> @@ -8473,15 +8487,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) ή (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>αέρας</translation> </message> @@ -8710,7 +8724,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>άγνωστο</translation> @@ -8968,7 +8982,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Σφάλμα στην ανάλυση του '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Αδύνατο το άνοιγμα του stylesheet %s</translation> </message> @@ -8984,21 +8998,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Προειδοποίηση:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, αποτελεσματικός Αναλογικός Συντελεστής Αποσυμπίεσης=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Αλλαγή Καθορισμένης Τιμής </translation> @@ -9014,195 +9028,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Ολικός χρόνος κατάδυσης: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>βάθος</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>διάρκεια</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>Ολικός χρόνος κατάδυσης</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>μείγμα</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Μετάβαση σε %.*f %s σε %d:%02d min - ολικός χρόνος κατάδυσης %d:%02u στο %s (Καθορισμένη Τιμή = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Μετάβαση σε %.*f %s σε %d:%02d min - ολικός χρόνος κατάδυσης %d:%02u σε %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Παραμονή σε %.*f %s για %d:%02d min - ολικός χρόνος κατάδυσης %d:%02u σε %s (Καθορισμένη Τιμή = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Παραμονή σε %.*f %s για %d:%02d min - ολικός χρόνος κατάδυσης %d:%02u σε %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(Καθορισμένη Τιμή = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Αλλαγή μείγματος σε %s (Καθορισμένη Τιμή = %.1fbar) </translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Αλλαγή μείγματος σε %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>Τοξικότητα Κεντρικού Νευρικού Συστήματος</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Πρότυπο αποσυμπίεσης: VPM-B στον ελάχιστο συντηρητισμό</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>Κατανάλωση Αέρα στην Επιφάνεια</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Πρότυπο αποσυμπίεσης: VPM-B σε +%d συντηρητισμό</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Ατμοσφαιρική πίεση: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Κατανάλωση μείγματος (τα σκέλη χρήσης κλειστού κυκλώματος επαναπνοής δεν υπολογίζονται):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Κατανάλωση μείγματος (βασισμένο στην Κατανάλωση Αέρα στην Επιφάνεια </translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>αυτή η ποσότητα μείγματος είναι μεγαλύτερη από την υπάρχουσα στην καθορισμένη φιάλη </translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>δεν υπάρχει αρκετό απόθεμα ανάγκης μείγματος για να διατεθεί εφόσον απαιτηθεί κατά τη διάρκεια της ανάδυσης! </translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>υψηλή τιμή pO₂ %.2f σε %d:%02u με μείγμα %s σε βάθος %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>χαμηλή τιμή pO₂ %.2f σε %d:%02u με μείγμα %s σε βάθος %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Δεν βρίσκεται το μέιγμα %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9796,6 +9826,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Κατάσταση κατάδυσης</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Ανοικτού Κυκλώματος </translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>Κλειστό κύκλωμα επαναπνοής</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>Παθητικό ημίκλειστο κύκλωμα επαναπνοής </translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Ελεύθερη κατάδυση</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9831,97 +9886,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(καμία κατάδυση)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Κυρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Δευ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Τρι</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Τετ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Πεμ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Παρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Σαβ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Ιαν</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Φεβ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Μαρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Απρ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Μαι</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Ιουν</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Ιουλ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Αυγ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Σεπ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Οκτ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Νοε</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Δεκ</translation> </message> @@ -10149,6 +10204,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Διάρκεια:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10254,7 +10310,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Βάθος</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>Σχεδιασμένο σημείο αναφοράς υπεράνω βάθους ασφαλούς ανάδυσης</translation> </message> @@ -10294,22 +10350,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Πόλη</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_en_GB.ts b/translations/subsurface_en_GB.ts index d1f4ebb41..d5d458408 100644 --- a/translations/subsurface_en_GB.ts +++ b/translations/subsurface_en_GB.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Clicking here will remove this cylinder.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Switch depth for deco. gas. Calculated using Deco. pO₂ preference, unless set manually.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>This gas is in use. Only cylinders that are not used in the dive can be removed.</translation> </message> @@ -2052,67 +2060,67 @@ GPS location:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>No profile to show</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Suit:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Air Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Cylinder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Map it</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Visibility:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Weight:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notes</translation> </message> @@ -2120,23 +2128,23 @@ GPS location:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manual switch to OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> end</translation> @@ -2174,23 +2182,23 @@ GPS location:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Dive list</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>No dives in dive list</translation> </message> @@ -2198,102 +2206,102 @@ GPS location:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expand all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Collapse all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Collapse others</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Remove dive(s) from trip</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Create new trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Add dive(s) to trip immediately above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Add dive(s) to trip immediately below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Merge trip with trip above</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Merge trip with trip below</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Delete dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Mark dive(s) invalid</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Merge selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumber dive(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Shift dive times</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Split selected dives</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Load image(s) from file(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Load image from web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Image files (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 does not appear to be an image</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Open image files</translation> </message> @@ -2301,12 +2309,12 @@ GPS location:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Create a new dive site, copying relevant information from the current dive.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Create a new dive site with this name</translation> </message> @@ -2966,27 +2974,33 @@ GPS location:</translation> <translation>unknown</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>cyl.</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Final depth</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Duration</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Used gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ GPS location:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Depth</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Time</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperature</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Colour</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>User entered</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Cylinder index</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Pressure S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Pressure I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Ambient pressure</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Heart rate</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Mean depth @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>error writing zip file: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Done</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Uploading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Downloading dive list...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Downloading %1 dives...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Download finished - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem with download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>The archive could not be opened: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Corrupted download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>The archive could not be opened: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload finished</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Upload successful</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login failed</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Cannot parse response</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Choose Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Connecting to dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Find Uemis dive computer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Cancel download</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Download</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Cancel</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth is not enabled</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation> Vendor name: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation> Dive Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation> Connection:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Retry</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Quit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation> Downloaded dives</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accept</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Select All</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Unselect All</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Connect to Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Facebook logged in successfully</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, unknown user id, cannot login.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Dive uploaded successfully to Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Dive upload failed. Please see debug output and send to Subsurface mailing list</translation> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Dive site management</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to continue?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>You are editing a dive site</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>New dive site</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Discard the changes?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>You are about to discard your changes.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Open</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Undo</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Redo</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Take cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Connect to</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Disconnect from</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Please save or cancel the current dive edit before opening a new file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Open file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Don't save an empty log to the cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Traverse image directories</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Scanning images...(this can take a while)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Warning</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation>Trying to merge dives with %1min interval between them</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Please save or cancel the current dive edit before closing the file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Please save or cancel the current dive edit before trying to add a dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Print runtime table</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Trying to replan a dive that's not a planned dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Please, first finish the current edition before trying to do another.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Trying to edit a dive that's not a manually added dive.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Yearly statistics</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Do you want to save the changes that you made in the file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Do you want to save the changes that you made in the data file?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Save changes?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Changes will be lost if you don't save them.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Save file as</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[local cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[cloud storage for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Opening datafile from older version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>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.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Open dive log file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Contacting cloud service...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Drag the selected dive location</translation> </message> @@ -5117,32 +5131,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Dive site geo lookup</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Enable geocoding for dive site management</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Parse site without GPS data</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Same format for existing dives</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation>Dive site layout</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5446,7 +5440,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud storage</translation> </message> @@ -5527,6 +5521,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface cloud storage (credentials verified)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5797,28 +5801,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Import template file</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Export template files as</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>This action cannot be undone!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Delete template: %1?</translation> </message> @@ -5826,12 +5830,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (No.%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Unknown dive computer</translation> </message> @@ -5841,108 +5845,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Show NDL / TTS was disabled because of excessive processing time</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Add gas change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Make default dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Planned dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Manually added dive</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Delete this dive computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Add setpoint change</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Add bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Edit the profile</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Remove event</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Hide similar events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Edit name</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Adjust pressure of tank %1 (currently interpolated as %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Unhide all events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Hide events</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Hide all %1 events?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Remove the selected event?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Edit name of bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Custom name:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Name is too long.</translation> </message> @@ -5950,147 +5954,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starting...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Open local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Opening local data file failed</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dives loaded from local dive data file</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>working in no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Error parsing local storage, giving up</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>no cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Please enter valid cloud credentials.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Invalid format for email address</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Attempting to open cloud storage with new credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Testing cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>No response from cloud server to validate the credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Incorrect cloud credentials</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Cannot connect to cloud storage - cloud account not verified</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Cloud credentials are invalid</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Cannot open cloud storage: Error creating https connection</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Cannot open cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Cannot connect to cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud credentials valid, loading dives...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Cloud storage error: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Loading dives from local storage ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Failed to connect to cloud server, reverting to no-cloud mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud storage open successfully. No dives in dive list.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Unknown GPS location</translation> </message> @@ -6248,6 +6252,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Malformed XML response. Line %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>No dive site layout categories set in preferences.</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tags</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6663,64 +6677,64 @@ Files with inappropriate date/time</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Small</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dive date: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duration: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dive location: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6813,12 +6827,12 @@ Files with inappropriate date/time</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is your first time using Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud button above.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7443,7 +7457,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1click to visit %2</translation> </message> @@ -8399,8 +8413,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8485,15 +8499,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>air</translation> </message> @@ -8722,7 +8736,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>unknown</translation> @@ -8982,7 +8996,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Failed to parse '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Can't open stylesheet %s</translation> </message> @@ -8998,21 +9012,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Warning:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP change</translation> @@ -9028,195 +9042,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>dive plan</b> (Overlapping dives detected)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>depth</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>duration</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Switch gas to %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Switch gas to %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Deco model: VPM-B at nominal conservatism</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Minimum gas</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>based on</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>dive plan</b> (surface interval </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>dive plan</b> created on</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIATIONS<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Deco model: VPM-B at +%d conservatism</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Atm. pressure: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gas consumption (CCR legs excluded):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gas consumption (based on SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>this is more gas than available in the specified cylinder!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>not enough reserve for gas sharing on ascent!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>required minimum gas for ascent already exceeds start pressure of cylinder.</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Can't find gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9818,6 +9848,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dive status</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Freedive</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>All (by trip stats)</translation> @@ -9853,97 +9908,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(no dives)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Sun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Mon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Tue</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Wed</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Thu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Fri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sat</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>May</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10173,6 +10228,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Duration:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10278,7 +10334,7 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>Depth</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>planned waypoint above ceiling</translation> </message> @@ -10318,22 +10374,22 @@ Is the Uemis Zurich plugged in correctly?</translation> <translation>City</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Start saving data</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Start saving dives</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Done creating local cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Preparing to save data</translation> </message> diff --git a/translations/subsurface_es_ES.ts b/translations/subsurface_es_ES.ts index 01bdbc5c9..e02eed25f 100644 --- a/translations/subsurface_es_ES.ts +++ b/translations/subsurface_es_ES.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Pulsar aquí borrará esta botella</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="272"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profundidad de cambio a gas de deco. Calculada usando la preferencia de pO₂ en deco, a menos que se ajuste manualmente.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculada usando la preferencia de pO₂ en fondo. Marcar la PMO ajusta el O₂ %. Indica '*' para el mejor O₂ % a la máxima profundidad.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculado usando la preferencia de mejor mezcla para PNE. Marcar PNM ajusta el He%. Indica '*' para el mejor He% a la máxima profundidad.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="258"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation> Este gas se está usando. Solo se pueden borrar botellas que no se usen en la inmersión.</translation> @@ -2175,23 +2183,23 @@ GPS actual:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Lista de inmersiones</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Credenciales de la nube</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Pulsa el botón '+' para añadir una inmersión (o descargar inmersiones desde un ordenador soportado)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Sin inmersiones en la lista</translation> </message> @@ -2199,102 +2207,102 @@ GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Contraer todo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Contraer otras</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Borrar inmersión(es) del viaje</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Crear nuevo viaje por encima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Añadir inmersión(es) al viaje de arriba</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Añadir inmersión(es) al viaje de debajo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Combinar viaje con el viaje de encima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Combinar viaje con el viaje de abajo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Borrar inmersión(es)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marcar inmersión(es) como no válida(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Mezclar las inmersiones seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumerar inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Desplazar hora de la inmersión</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Divide las inmersiones seleccionadas</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Cargar imagen(es) de archivo(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Cargar imagen de la web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Archivos de imagen (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 no parece ser una imagen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Abrir archivos de imagen</translation> </message> @@ -3358,7 +3366,7 @@ p, li { white-space: pre-wrap; } <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="259"/> <source>Conversion of dive %1 to divelogs.de format failed</source> - <translation>Ha fallado la conversión de la inmersión %d al formato de divelogs.de</translation> + <translation>Ha fallado la conversión de la inmersión %1 al formato de divelogs.de</translation> </message> <message> <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="287"/> @@ -3366,82 +3374,82 @@ p, li { white-space: pre-wrap; } <translation>error al escribir el archivo zip: %s error de zip %d error de sistema %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Hecho</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Subiendo lista de inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Descargando lista de inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Descargando %1 inmersiones…</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Descarga finalizada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problema con la descarga</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>No se ha podido abrir el archivo: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Descarga corrompida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>El archivo no pudo abrirse %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Subida finalizada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>La subida ha fallado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Subida correcta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>El acceso ha fallado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>No se puede leer la respuesta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Error: %1</translation> </message> @@ -3658,17 +3666,17 @@ p, li { white-space: pre-wrap; } <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Aceptar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Seleccionar todo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Des-seleccionar todo</translation> </message> @@ -3699,12 +3707,12 @@ p, li { white-space: pre-wrap; } <translation>Conectar al marcador de texto de Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Para desconectar Subsurface de tu cuenta de Facebook, utiliza la opción 'Compartir' del menú.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Para conectar con Facebook, por favor inicie sesión. Esto permitirá a Subsurface publicar inmersiones en su historial.</translation> </message> @@ -3712,22 +3720,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Regsitrado correctamente en Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Error, id de usuario desconocida, no se pudo conectar</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Inmersión subida a Facebook con exito</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Ha fallado el envío de la inmersión. Por favor, comprueba la salida de depuración y remítela a la lista de correo de Subsurface.</translation> </message> @@ -4292,7 +4300,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4588,13 +4596,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Deshacer</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Rehacer</translation> </message> @@ -4634,63 +4642,63 @@ p, li { white-space: pre-wrap; } <translation>Activar almacenamiento en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Conectar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Desconectar de </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de abrir otro archivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Abrir archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> <source>Don't save an empty log to the cloud</source> <translation>No guardar un divelog vacío en la nube</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Buscar en directorios de imágenes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Escanear</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Buscando imágenes ... (esto puede llevar un tiempo)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Advertencia</translation> </message> @@ -4700,100 +4708,100 @@ p, li { white-space: pre-wrap; } <translation>Intentando fusionar inmersiones con %1min de intervalo entre ellas</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de cerrar el archivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, guarda o cancela la edición de la inmersión actual antes de intentar añadir otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Imprimir tabla de tiempo acumulado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Se está intentando re-planificar un buceo que no ha sido planificado</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termina la edición actual antes de intentar hacer otra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Intentando editar una inmersión que no se ha añadido manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Estadísticas anuales</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>¿Quieres guardar los cambios realizados en el archivo %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>¿Quieres guardar los cambios que has hecho en el archivo de datos?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>¿Guardar cambios?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Se perderán los cambios si no los guarda.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Guardar archivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Archivos XML de Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[caché local de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[almacenamiento en la nube de] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Abriendo archivo de datos de una versión anterior</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Has abierto un archivo de datos de una versión anterior de Subsurface. Te recomendaamos leer el manual para informarte acerca de los cambios de la nueva versión, especialmente sobre la gestión de puntos de buceo que ha variado significativamente. Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perder un momento en echar una mirada al nuevo sistema de gestión de puntos de buceo para asegurarte de que todo este correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Abrir archivo de registro de inmersiones</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Archivos de divelog (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Archivos Cochran (*.can *.CAN);;Archivos CSV (*.csv *.CSV);;Archivos DiveLog.de (*.dld *.DLD);;Archivos JDiveLog (*.jlb *.JLB);;Archivos Liquivision (*.lvd *.LVD);;Archivos MkVI (*.txt *.TXT);;Archivos Suunto (*.sde *.db *.SDE *.DB);;Archivos Divesoft (*.dlf *.DLF);;Archivos UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Archivos XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Archivos Datatrak/WLog (*.log *.LOG);;Archivos OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Todos los archivos (*)</translation> </message> @@ -4806,7 +4814,7 @@ Subsurface ya ha intentado cargar los datos pero puede que merezca la pena perde <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Arrastra el punto de buceo seleccionado</translation> </message> @@ -5124,32 +5132,12 @@ Si tu dispositivo usa Bluetooth, efectúa los mismos preparativos que para desca </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Busqueda geográfica de puntos de buceo</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Habilitar geocoding para la gestión de puntos de buceo</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Analizar puntos sin datos GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Igual formato para inmersiones existentes</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> <source>Dive site layout</source> <translation>Configuración de la ubicación de buceo</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5453,7 +5441,7 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Almacenamiento en la nube de Subsurface</translation> </message> @@ -5534,6 +5522,16 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Almacenamiento en la nube de Subsurface (credenciales verificadas)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5848,17 +5846,17 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> <translation>Mostrar LND/TTS se ha desactivado por excesivo tiempo de proceso</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Añadir cambio de gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Botella %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Convertir en ordenador de buceo principal</translation> </message> @@ -5873,83 +5871,83 @@ Visita http://doc.qt.io/qt-5/qdatetime.html#toString </translation> <translation>Inmersión añadida a mano</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Borrar este ordenador de buceo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Añadir cambio de "set-point"</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Añadir marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Editar el perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Borrar evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Ocultar eventos similares</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Editar nombre</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajustar presión de botella %1 (actualmente calculada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Revelar todos los eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>¿ Ocultar todos los eventos %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>¿ Borrar el evento seleccionado ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Editar el nombre de la marca</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nombre personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>¡El nombre es demasiado largo!</translation> </message> @@ -6681,64 +6679,64 @@ Archivos con fecha/hora incorrectas</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pequeño</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Fecha de la inmersión: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duración: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lugar de la inmersión: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Compañero: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7461,7 +7459,7 @@ a partir de aire y usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1clica para visitar %2</translation> </message> @@ -8740,7 +8738,7 @@ Media</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconocido</translation> @@ -9000,7 +8998,7 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>No se pudo analizar '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>No se puede abrir la hoja de estilo %s</translation> </message> @@ -9051,6 +9049,11 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>Plan de inmersión</b> (Se ha detectado superposición de inmersiones)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9175,11 +9178,6 @@ Puedes crear el archivo de registro seleccionando la casilla correspondiente en <translation>plan de buceo</b> creado en</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIACIONES<br></div></translation> - </message> - <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo deco: Bühlmann ZHL-16C con GFbajo = %d%% y GFalto = %d%%</translation> @@ -9852,6 +9850,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Estado de la inmersión</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Apnea</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Todo (por estadísticas de viaje)</translation> @@ -9887,97 +9910,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ninguna inmersión)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Do</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Lu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Ma</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Mi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Ju</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Vi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sa</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Ene</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mayo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dic</translation> </message> @@ -10353,22 +10376,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Ciudad</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Comienza el guardado de datos</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Comienza el guardado de inmersiones</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Crear caché local terminado</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Preparando el guardado de datos</translation> </message> diff --git a/translations/subsurface_et_EE.ts b/translations/subsurface_et_EE.ts index a40e2aeb8..97ffa926f 100644 --- a/translations/subsurface_et_EE.ts +++ b/translations/subsurface_et_EE.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Siin klikkamine eemaldab selle ballooni</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>See gaas on kasutusel. Eemaldada saab ainult neid balloone, mis pole sellel sukeldumisel kasutusel.</translation> </message> @@ -1949,7 +1957,7 @@ <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="89"/> <source>Dive %1</source> - <translation>Sukeldumise #</translation> + <translation>Sukeldumise #%1</translation> </message> <message> <location filename="../mobile-widgets/qml/DiveDetailsEdit.qml" line="93"/> @@ -2052,67 +2060,67 @@ asukohta:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Pole profiili mida näidata</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Ülikond:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Õhu temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Balloon:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Vee temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Hinne:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Raskus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Semu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Märkmed</translation> </message> @@ -2120,23 +2128,23 @@ asukohta:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(balloon %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Käsilülitus avatud süsteemile</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> algus</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> lõpp</translation> @@ -2174,23 +2182,23 @@ asukohta:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Sukeldumiste nimekiri</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Pilve volitused</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2198,102 +2206,102 @@ asukohta:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Laienda kõik</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Ahenda kõik kokku</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Ahenda teised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Eemalda sukeldumine/sukeldumised väljasõidust</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Loo uus väljasõit üles</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisa sukeldumine/sukeldumised otse eespool asuvale väljasõidule</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisa sukeldumine/sukeldumised otse allpool asuvale väljasõidule</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Ühenda väljasõit väljasõiduga ülal</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Ühenda väljasõit väljasõiduga all</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Kustuta sukeldumine/sukeldumised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Märgi sukeldumine/sukeldumised kehtetuks</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Ühenda valitud sukeldumised</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Nummerda sukeldumine/sukeldumised ümber</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Nihuta sukeldumise ajad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Lae pilt (pildid) faili(de)st</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Lae pilt veebist</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 ei paista olevat pilt</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Ava pildifailid</translation> </message> @@ -2301,12 +2309,12 @@ asukohta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Loo uus sukeldumiskoht kopeerides asjakohase info praegusest sukeldumisest</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Loo uus sukeldumiskoht selle nimega</translation> </message> @@ -2966,27 +2974,33 @@ asukohta:</translation> <translation>tundmatu</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Lõppsügavus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Töö aeg</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Kestus</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Kasutatud gaas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3022,112 +3036,107 @@ asukohta:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Sügavus</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Aeg</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Rõhk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Värvus</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Kasutaja sisestatud</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Ballooni indeks</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Rõhk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Rõhk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Lagi</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHE</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Ümbritsev rõhk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Südame pulss</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Keskmine sügavus @ s</translation> </message> @@ -3369,82 +3378,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Valmis</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Sukeldumiste listi üleslaadimine...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Sukeldumiste listi allalaadimine...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Laen alla %1 sukeldumist...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Allalaadimine lõppenud - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Probleem allalaadimisel</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arhiivi ei ole võimalik avada: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Vigane allalaadimine</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arhiivi ei saa avada: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Üleslaadimine lõppenud</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Üleslaadimine ebaõnnestus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Üleslaadimine edukas</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Sisselogimine ebaõnnestus</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Ei suuda vastust tuvastada</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Viga: %1</translation> </message> @@ -3452,33 +3461,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Allalaadimine</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Vali Bluetoothi allalaadimise viis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Viga</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Leia Uemis sukeldumiskompuuter</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3585,7 +3594,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Allalaadimine</translation> </message> @@ -3611,7 +3620,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Loobu</translation> </message> @@ -3626,52 +3635,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Tarnija nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Sukeldumiskompuuter:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Korda</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Välju</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Allalaetud sukeldumised</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Kinnita</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Vali kõik</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Tühista kõik</translation> </message> @@ -3702,12 +3711,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Facebookiga ühenduse loomiseks logi sinna sise. See võimaldab Suibsurface'l avaldada sukeldumisi sinu ajajoonel</translation> </message> @@ -3715,22 +3724,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3981,7 +3990,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Sukeldumiskohtade haldamine</translation> </message> @@ -4003,7 +4012,7 @@ p, li { white-space: pre-wrap; } Oled kindel et soovid jätkata?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Toimetad sukeldumiskohta</translation> </message> @@ -4231,12 +4240,12 @@ Oled kindel et soovid jätkata?</translation> <translation>Uus sukeldumiskoht</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Loobu muudatustest?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Oled muudatustest loobumas.</translation> </message> @@ -4295,7 +4304,7 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Ava</translation> </message> @@ -4591,13 +4600,13 @@ Oled kindel et soovid jätkata?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4637,58 +4646,63 @@ Oled kindel et soovid jätkata?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Ühenda</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Ühenda lahti</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Enne uue faili avamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Ava fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Loobu</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Skaneeri</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Hoiatus</translation> </message> @@ -4698,104 +4712,104 @@ Oled kindel et soovid jätkata?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Enne faili sulgemist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Enne sukeldumise lisamist salvesta või katkesta käesoleva sukeldumise toimetamine.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Väljasta jooksva aja tabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Lõpeta praegune toimetamine enne järgmise alustamist.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Aastane statistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Kas soovid salvestada muudatused mis tegid faili %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Kas soovid salvestada muudatused mis tegid andmefaili?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Salvesta muudatused?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Muudatusi lähevad kaotsi kui neid ei salvestata.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Salvesta nimega</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Ava sukeldumislogi fail</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4803,7 +4817,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5118,32 +5132,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface pilve salvesti</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Impordi mallifail</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML failid (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Ekspordi mallifail kui</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Kustuta mall: %1?</translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation>(#%1 %2st)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Tundmatu sukeldumiskompuuter</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Lisa gaasivahetus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Balloon %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Lisa järjehoidja</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Toimeta profiili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Eemalda sündmus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Peida sarnased sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Toimeta nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Peida kõik sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Peida sündmused</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Peida kõik %1 sündmust?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Eemalda valitud sündmus?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Toimeta järjehoidja nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Kohandatud nimi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Nimi on liiga pikk!</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Alustan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>Töötamine mitte-pilve režiimis</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>pole pilve volitusi</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Palun sisesta kehtivad pilve volitused.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Üritan avada pilvesalvestit uute volitustega</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Pilve volituste testimine</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Ei saa avada pilve salvestit: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Ei saa ühendust pilve salvestiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Pilve salvesti viga: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Pilve salvesti avamine õnnestus. Sukeldumiste nimekiri on tühi.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Tundmatu GPS koht</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Vigane XML vastus. Rida %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Märgendid</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6659,64 +6673,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Keskmine</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Sukeldumise kuupäev: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Kestus: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sukeldumise asukoht: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Semu: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6809,12 +6823,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7438,7 +7452,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8391,8 +8405,8 @@ Max</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>hapnik</translation> </message> @@ -8477,15 +8491,15 @@ Max</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) või (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>õhk</translation> </message> @@ -8714,7 +8728,7 @@ Max</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>tundmatu</translation> @@ -8970,7 +8984,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>'%s' tuvastamine ebaõnnestus</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Ei suuda avada stiililehte %s</translation> </message> @@ -8986,21 +9000,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Hoiatus:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -9016,195 +9030,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>sügavus</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>kestus</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>jooksev aeg</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gaas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Üleminek %.*f %s-le %d:%02d min jooksul - jooksev aeg %d:%02u %s peal</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Püsi %.*f %s peal %d:%02d min - jooksev aeg %d:%02u %s peal</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Vaheta gaasiks %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM rõhk: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gaasikulu (CCR lõigud välja arvatud):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gaasi tarbimine (SAC põhine</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>gaasi hulk on suurem kui määratud balloonis võimalik!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>pole piisavalt reservi gaasi jagamiseks tõusul!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>kõrge pO₂ väärtus %.2f %d:%02u peal gaasiga %s sügavusel %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Ei leia gaasi %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9791,6 +9821,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Sukeldumise staatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Vabasukeldumine</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9826,97 +9881,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(pole sukeldumisi)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Pühap</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Esmasp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Teisip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Kolmap</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Neljap</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Reede</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Laup</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jaan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Veebr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Märts</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Juuni</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Juuli</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sept</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dets</translation> </message> @@ -10141,6 +10196,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Kestus:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10246,7 +10302,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Sügavus</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10286,22 +10342,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Linn</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_fi_FI.ts b/translations/subsurface_fi_FI.ts index 277a7df98..88df19b96 100644 --- a/translations/subsurface_fi_FI.ts +++ b/translations/subsurface_fi_FI.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Poista säiliö.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dekokaasun vaihtosyvyys. Lasketaan käyttäen dekon pO₂ -asetusta, ellei arvoa ole asetettu käsin.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Laskettu käyttäen pohjan pO₂ asetusta. MOD vaikuttaa O₂%:iin, aseta arvoksi '*' parhaaksi O₂% maksimi syvyyteen.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Laskettu käyttäen parhaan seoksen asetusta END. Asetus MND muttaa He%, aseta '*' saadaksesi optimaalisen He% maksimisyvyyteen.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Tämä kaasu on käytössä. Vain säiliöt, joita ei käytetä sukelluksella, voidaan poistaa.</translation> </message> @@ -2051,67 +2059,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Ei näytettävää graafia</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Puku:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Ilman lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Säiliö:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Veden lämpötila:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Kartalle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Yleisarvio:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Näkyvyys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Massa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Sukelluspari:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>Pintakulutus:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Muistiinpanot</translation> </message> @@ -2119,23 +2127,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Vaihto avoimeen kiertoon</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>alku</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>loppu</translation> @@ -2173,23 +2181,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Sukelluslista</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Pilvipalvelun tunnus</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Käytä '+' -painiketta lisätäksesi sukelluksen (tai ladataksesi sukellukset tuetulta sukellustietokoneelta)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Ei sukelluksia lokissa</translation> </message> @@ -2197,102 +2205,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Laajenna kaikki retket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Supista kaikki retket</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Tiivistä muut</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Erota sukellukset retkestä</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Liitä uuteen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Lisää sukellukset yläpuoliseen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Lisää sukellukset alapuoliseen retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Liitä retki yllä olevaan retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Liitä retki alla olevaan retkeen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Poista sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Merkitse sukellukset epäkelvoiksi</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Yhdistä valitut sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Numeroi uudelleen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Muuta sukellusaikoja</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Jaa valitut sukellukset</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Lataa kuvia tiedostoista</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Lataa kuve verkosta</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Kuvatiedostoja (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 ei vaikuta kuvalta</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Avaa kuvatiedostot</translation> </message> @@ -2300,12 +2308,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Luo uusi sukelluskohde ja kopioi oleelliset tiedot valitusta sukelluskohteesta</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Luo uusi sukelluskohde tälle nimelle</translation> </message> @@ -2965,27 +2973,33 @@ GPS location:</source> <translation>tuntematon</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>säiliö</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Lopullinen syvyys</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Kesto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Käytetty kaasuseos</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC -asetuspiste</translation> </message> @@ -3021,112 +3035,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Syvyys</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Kello</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Paine</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Lämpötila</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Väri</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Käyttäjän syöttämä</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Säiliöindeksi</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Sensoripaine</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Arvioitu paine</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Katto</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>Pintakulutus</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensori 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensori 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensori 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Ympäröivä paine</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Syke</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient Factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Keskisyvyys @ s</translation> </message> @@ -3363,82 +3372,82 @@ p, li { white-space: pre-wrap; } <translation>virhe zip -tiedoston kirjoittamisessa: %s zip virhe %d järjestelmävirhe %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Valmis</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Lähetetään sukelluslokia...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Ladataan sukelluslokia...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Ladataan %1 sukellusta...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Lataus päättynyt - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Virhe latauksessa</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Pakattua tiedostoa ei voitu avata: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Lataus on korruptoitunut</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Pakattua tiedostoa ei voitu avata: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Lähetys valmistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Lähetys epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Lähetys onnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Kirjautuminen epäonnistui</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Vastauksen jäsentäminen ei onnistu!</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Virhe: %1</translation> </message> @@ -3446,33 +3455,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Lataa</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Valitse latausmoodi Bluetoothille</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Muodostetaan yhteyttä sukellustietokoneeseen</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Virhe</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Etsi Uemis -sukellustietokone</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Peruuta lataus</translation> </message> @@ -3579,7 +3588,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Lataa</translation> </message> @@ -3605,7 +3614,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Peruuta</translation> </message> @@ -3620,52 +3629,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth ei ole päällä</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Valmistajan nimi:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Sukellustietokone:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Yhteys:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Yritä uudestaan</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Lopeta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Ladatut sukellukset</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Tietoja:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Hyväksy</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Valitse kaikki</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Poista valinnat</translation> </message> @@ -3696,12 +3705,12 @@ p, li { white-space: pre-wrap; } <translation>Yhdistä Facebookiin tekstialue</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Käytä 'Jaa' -valikkoa katkaistaksesi Subsurfacen yhteyden Facebook-tunnukseesi.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Kirjaudu sisään luodaksesi yhteyden Facebookiin. Tämä mahdollistaa sukelluslokien julkaisun aikajanaasi suoraan Subsurfacesta</translation> </message> @@ -3709,22 +3718,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Kirjauduttiin onnistuneesti Facebookiin</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Virhe, tuntematon käyttäjätunnus, kirjautuminen epäonnistui.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Sukellus tallennettiin onnistuneesti Facebookiin</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Sukelluksen lähettäminen epäonnistui. Lähetä debug-tulostus Subsurfacen postituslistalle</translation> </message> @@ -3975,7 +3984,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Sukelluskohteiden hallinta</translation> </message> @@ -3996,7 +4005,7 @@ p, li { white-space: pre-wrap; } <translation>Olet yhdistämässä sukelluskohteita. Toimintoa ei voi perua. Oletko varma, että haluat jatkaa?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Muokkaat sukelluskohdetta</translation> </message> @@ -4224,12 +4233,12 @@ p, li { white-space: pre-wrap; } <translation>Uusi sukelluskohde</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Hylätäänkö muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Olet hylkäämässä muutoksesi.</translation> </message> @@ -4288,7 +4297,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Avaa</translation> </message> @@ -4584,13 +4593,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Peruuta</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Tee uudelleen</translation> </message> @@ -4630,58 +4639,63 @@ p, li { white-space: pre-wrap; } <translation>Avaa pilvipalvelun verkkoyhteys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Yhdistä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Katkaise yhteys</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen kuin avaat uuden lokin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Avaa tiedosto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Peruuta</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Älä tallenna tyhjää lokitiedostoa pilveen</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Hae kuvia alihakemistoista</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Etsi</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Kuvien etsintä käynnissä...(tämä voi kestää kauan)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Varoitus</translation> </message> @@ -4691,105 +4705,105 @@ p, li { white-space: pre-wrap; } <translation>Yritetään yhdistää sukelluksia %1min "pinta-ajalla"</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen lokitiedoston sulkemista.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ole hyvä ja tallenna tai peruuta sukelluksen muokkaus ennen sukelluksen lisäystä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Tulosta sukellussuunnitelma</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Yritetään muokata sukellusta, joka ei ole sukellussuunnitelma.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ole hyvä ja lopeta nykyinen muokkaus ennen kuin aloitat uuden.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Yrität muokata sukellusta, joka ei ole syötetty käsin.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Vuositilastot</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Haluatko tallentaa muutoksesi tiedostoon?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Tallenna muutokset?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Muutokset hylätään, jos et tallenna niitä.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Tallenna nimellä</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurfacen XML tiedostot (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[paikallinen cache] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[pilvitallennus] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Avataan vanhan tiedostomuodon loki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Avasit vanhan tiedostomuodon lokitiedoston. Suosittelemme, että luet uuden version muutoksista käyttöohjeesta, etenkin sukelluskohteiden hallinnasta, sillä se on muuttunut huomattavasti. Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa vielä tarkistaa uudesta sukelluskohteiden hallinnasta, että kaikki tiedot ovat oikein.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Avaa sukellusloki</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Sukellusloki -tiedostot (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran -tiedostot (*.can *.CAN);;CSV -tiedostot (*.csv *.CSV);;DiveLog.de -tiedostot (*.dld *.DLD);;JDiveLog -tiedostot (*.jlb *.JLB);;Liquivision -tiedostot (*.lvd *.LVD);;MkVI -tiedostot (*.txt *.TXT);;Suunto -tiedostot (*.sde *.db *.SDE *.DB);;Divesoft -tiedostot (*.dlf *.DLF);;UDDF/UDCF -tiedostot (*.uddf *.udcf *.UDDF *.UDCF);;XML -tiedostot (*.xml *.XML);;APD log -tiedostot (*.apd *.APD);;Datatrak/WLog -tiedostot (*.log *.LOG);;OSTCtools -tiedostot (*.dive *.DIVE);;DAN DL7 -tiedostot (*.zxu *.zxl *.ZXU *.ZXL);;Kaikki tiedostot (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Otetaan yhteyttä pilvipalveluun...</translation> </message> @@ -4797,7 +4811,7 @@ Subsurface on jo yrittänyt esi-täyttää sijaintitiedot, mutta kannattaa viel <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Raahaa valittu sukelluskohde</translation> </message> @@ -5115,32 +5129,12 @@ Mikäli laitteesi käyttää Bluetoothia, tee samat toimenpiteet kuin lokia lada </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Sukelluskohteen sijainnin haku</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Ota käyttöön sukelluskohteiden maantiedehaku</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Lue kohde ilman GPS -tietoja</translation> + <source>Dive site layout</source> + <translation>Sukelluskohteen asettelu</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Käytä samaa muotoa olemassaoleville sukelluksille</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Sukelluskohteiden määrittely</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5443,7 +5437,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurfacen pilvitallennustila</translation> </message> @@ -5524,6 +5518,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurfacen pilvitallennustila (käyttäjä todennettu)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5685,12 +5689,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="274"/> <source>Dive list table</source> - <translation type="unfinished"/> + <translation>Sukelluslistataulukko</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="280"/> <source>Show units in dive list table</source> - <translation type="unfinished"/> + <translation>Näytä mittayksiköt sukelluslistassa</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_units.ui" line="290"/> @@ -5794,28 +5798,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Tuonti</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Liitä sapluunatiedosto</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML -tiedostot (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Vie sapluunatiedosto nimellä</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Tätä toimintoa ei voida perua</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Poistetaanko sapluuna: %1?</translation> </message> @@ -5823,12 +5827,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 / %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Tuntematon sukellustietokone</translation> </message> @@ -5838,108 +5842,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Suoranousu-/pintautumisaikaa ei näytetä, koska niiden laskemiseen kuluu liikaa aikaa</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Lisää kaasun vaihto</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Säiliö %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Aseta ensimmäiseksi sukellustietokoneeksi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Suunniteltu sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Käsin lisätty sukellus</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Poista tämä sukellustietokone</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Aseta setpoint-muutos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Lisää kirjanmerkki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Muokkaa profiilia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Poista tapahtuma</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Piilota samankaltaiset tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Muokkaa nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Muuta säiliön %1 painetta (tällä hetkellä %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Näytä kaikki tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Piilota tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Piilota kaikki %1 tapahtumat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Poistetaanko valitut tapahtumat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Muokkaa kirjanmerkin nimeä</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Valinnainen nimi:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Nimi on liian pitkä!</translation> </message> @@ -5947,147 +5951,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Ladataan...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Avaa paikallinen sukelluslokitiedosto</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Paikallisen tiedoston avaus epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 sukellusta ladattu paikallisesta tiedostosta</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>käytä off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Virhe paikallisen tallenteen jäsentämisessä, keskeytetään</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Ei pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Syötä pilvipalvelun tunnuksent.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Pilvipalvelun sähköpostiosoitteessa ja salasanassa voi olla vain kirjaimia, numeroita ja merkit '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Virheellinen sähköpostiosoite</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Yritetään avata yhteyttä pilvipalveluun uusilla tunnuksilla</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Testataan pilvipalvelun tunnuksia</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Käyttäjätunnusta ei voitu vahvistaa, koska pilvipalvelin ei vastaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Virheelliset pilvitunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Yhteys pilvipalveluun epäonnistui - käyttäjätunnusta ei voida vahvistaa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Virheelliset pilvipalvelun tunnukset</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Yhteys pivlipalveluun epäonnistui: Virhe luotaessa HTTPS -yhteyttä</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Pilvitallennuksen yhteyden avaus epäonnistui: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Yhteys pilvitallennukseen epäonnistui</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Pilvitunnukset OK, ladataan sukelluksia...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Virhe pilvitallennuksessa: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Ladataan sukellukset paikallisesta tallennustilasta ('ei pilve' tila)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Yhteysvirhe pilvipalveluun, käytetään off-line -tilassa</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Yhteys muodostettu pilvipalveluun. Sukelluslista on tyhjä.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Tuntemattomat GPS -sijainnit</translation> </message> @@ -6245,6 +6249,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Virheellinen XML vastasu. Rivi %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Asetuksissa ei ole sukelluskohteiden määrityksiä!</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Avainsanat</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6658,64 +6672,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pieni</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Keskimääräinen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Sukelluspäivä: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Kesto: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sukelluskohde: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Sukelluspari: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6808,12 +6822,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>Käyttääksesi Subsurface-mobiilia pilvitallennustilan kanssa, syötä käyttäjätunnuksesi ja salasanasi. <br/><br/>Mikäli tämä on ensimmäinen kerta, kun käytät Subsurfacen pilvitallennusta, syötä sähköpostiosoitteesi (kaikki pieniä kirjaimia) ja haluamasi salasana (kirjaimia ja numeroita). <br/><br/>Käyttääksesi Subsurface-mobiilia pelkästään paikallisella tallennuksella, valitse ei-pilveä -painike.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Kiitoksia Subsurfacen rekisteröinnistä. Lähetimme <b> %1 </b> PIN-koodin rekisteröinnin viimeistelemiseksi. Jos et saa viestiä 15 minuutin sisällä, tarkista sähköpostiosoitteesi ja spam-kansiosi. <br/><br/>Mikäli sinulla on ongelmia pilvitallennuksen kanssa, otathan yhteyttä käyttäjä-foorumilla (https://subsurface-divelog.org/user-forum/). <br/><br/></translation> </message> @@ -7438,7 +7452,7 @@ sekoittaa ilmasta ja käyttäen: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>napauta %1 pohjassa avataksesi %2</translation> </message> @@ -8394,8 +8408,8 @@ Keski</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>happi</translation> </message> @@ -8480,15 +8494,15 @@ Keski</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) tai (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>ilma</translation> </message> @@ -8551,7 +8565,7 @@ Keski</translation> <message> <location filename="../core/file.c" line="688"/> <source>Poseidon import failed: unable to read '%s'</source> - <translation>Poseidon -tuonti epäonnistui: tiedoston '%2' luku epäonnistui</translation> + <translation>Poseidon -tuonti epäonnistui: tiedoston '%s' luku epäonnistui</translation> </message> <message> <location filename="../core/file.c" line="724"/> @@ -8717,7 +8731,7 @@ Keski</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>tuntematon</translation> @@ -8977,9 +8991,9 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>Tiedoston '%s' lukeminen epäonnistui.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> - <translation>Tyylitiedoston %1 avaus ei onnistu</translation> + <translation>Tyylitiedoston %s avaus ei onnistu</translation> </message> <message> <location filename="../core/plannernotes.c" line="62"/> @@ -8993,21 +9007,21 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Varoitus:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, efektiivinen GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP:n mutos</translation> @@ -9023,196 +9037,212 @@ Voit luoda tämän tiedoston valitsemalla kyseisen valinnan sukellusten lataus - <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>Sukellussuunnitelma </b>(Päällekkäisiä sukelluksia havaittu)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Kesto: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>syvyys</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>kesto</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>sukellusaika</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>kaasu</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Siirtymä %.*f %s ajassa %d:%02d min - sukellusaika %d:%02u on %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Pysy syvyydessä %.*f %s %d:%02d min - aika %d:%02u seoksella %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pysy %.*f %s:n syvyydessä %d:%02d min - sukellusaika %d:%02u %s:lla</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3d min</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Vaihda kaasu seuraavaan %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Vaihda kaasu seuraavaan: %s </translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>Happikertymä (CNS)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>Happikertymä (OTU)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomalli: VPM-B nimelliskonservatismilla</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Minimikaasu</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>perustuu</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>Pintakulutus</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>sukellussuunnitelma</b> (pinta-aika </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>luotu</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>sukellussuunnitelma</b> luotu</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Sukellusaika: %dmin MUUNNELMAT <br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomalli: Bühlmann ZHL-16C: GFLow = %d%% ja GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomalli: VPM-B +%d konservatismilla</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomalli: Harrastesukellus perustuen Bühlmann ZHL-16B käyttäen GFLow = %d%% ja GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Ilmanpaine: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Kaasun kulutus (CCR -etappeja ei mukana):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Ilmankulutus (perustuen SAC:iin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>tämä on enemmän kaasua kuin sinulla on määritellyissä säiliöissä!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>sinulla ei ole tarpeeksi kaasua jakaaksesi sitä pintaan nousun ajan!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimi kaasu</span> (perustuu %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>tarvitaan enemmän kaasua, kuin sylinterissä on lähdössä </translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s suunnitellussa nousussa)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s suunnitellussa nousussa) <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>korkea pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>matala pO₂ -arvo %.2f %d:%02u:ssa seoksella %s syvyydessä %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Seosta %s ei löydy</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9813,6 +9843,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Sukelluksen tila</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Vapaakierto</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Vapaasukellus</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Kaikki (matkan tilastojen mukaan)</translation> @@ -9848,97 +9903,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ei sukelluksia)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>su</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>ma</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>ti</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>ke</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>to</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>pe</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>la</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>tammi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>helmi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>maalis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>huhti</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>touko</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>kesä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>heinä</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>elo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>syys</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>loka</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>marras</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>joulu</translation> </message> @@ -10167,6 +10222,7 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Kesto:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10272,7 +10328,7 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Syvyys</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>Suunniteltu etappipysähdys katon yläpuolella</translation> </message> @@ -10312,22 +10368,22 @@ Onko Uemis Zurich kytketty oikein?</translation> <translation>Kaupunki</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Tallenna tiedot</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Tallenna sukellukset</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Paikallisen välitallennustilan luonti valmis</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Valmistellaan datan tallennus</translation> </message> diff --git a/translations/subsurface_fr_FR.ts b/translations/subsurface_fr_FR.ts index 89c28acb2..a935bd52c 100644 --- a/translations/subsurface_fr_FR.ts +++ b/translations/subsurface_fr_FR.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Retirer ce bloc.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="272"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profondeur de changement pour le gaz de déco. Calculé en utilisant les préférences de pO2 de déco, à moins qu'elle ne soit définie manuellement.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculé en utilisant les préférences de pO2 de fond. La modification du MOD ajuste le taux d'O₂ sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculé en utilisant les préférences du Meilleur Mélange du END. La modification du MND ajuste le taux d'He sur '*' permettant un meilleur taux à la profondeur max.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="258"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ce gaz est utilisé. Seuls les blocs qui ne sont pas utilisés dans la plongée peuvent être retirés.</translation> </message> @@ -2174,23 +2182,23 @@ GPS actuelle :</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Liste de plongée</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Informations de connexion pour le cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Veuillez cliquer sur le bouton '+' pour ajouter une plongée (ou télécharger des plongées depuis un ordinateur supporté)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Aucune plongée dans la liste de plongée</translation> </message> @@ -2198,102 +2206,102 @@ GPS actuelle :</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Tout déplier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Tout replier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Replier les autres</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Supprimer la plongée(s) du voyage</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Créer un nouveau voyage au-dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Ajouter la(les) plongée(s) au voyage immédiatement au dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Ajouter la (les) plongée(s) au voyage immédiatement ci-dessous</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Fusionner le voyage avec le voyage du dessus</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Fusionner le groupe avec le voyage du dessous</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Effacer des plongée(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marquer des plongée(s) comme invalides</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Fusionner les plongées sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renuméroter des plongée(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Décaler l'heure des plongées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Diviser les plongées sélectionnées</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Charger le(s) image(s) à partir du(des) fichier(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Charger l'image depuis le web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Fichiers images (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 ne semble pas être une image</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Ouvrir les fichiers images</translation> </message> @@ -3365,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>erreur lors de l'écriture du fichier zip : %s erreur zip %d erreur système %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Terminé</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Envoi de la liste des plongées</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Téléchargement de la liste des plongées...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Téléchargement en cours de %1 plongées...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Téléchargement terminé - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Erreur de téléchargement</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>L'archive n'a pas pu être ouverte : </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Téléchargement corrompu</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>L'archive ne peut pas être ouverte : %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Envoi terminé</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Échec de l'envoi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Envoi terminé avec succès</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Échec de connexion</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Impossible d'analyser la réponse</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Erreur : %1</translation> </message> @@ -3657,17 +3665,17 @@ p, li { white-space: pre-wrap; } <translation>Info :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accepter</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Tout sélectionner</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Tout désélectionner</translation> </message> @@ -3698,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Se connecter à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Déconnectez-vous de Facebook en utilisant le menu 'Partager sur'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Identifiez-vous à Facebook afin de publier vos plongées sur votre profil</translation> </message> @@ -3711,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Connexion à Facebook réussie</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Erreur, identifiant inconnu, impossible de se connecter.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Plongée envoyée avec succès à Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Échec de l'envoi de la plongée. Veuillez vérifier les informations de débogage et les envoyer à liste de diffusion de Subsurface</translation> </message> @@ -4291,7 +4299,7 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Ouvrir</translation> </message> @@ -4587,13 +4595,13 @@ cette opération. Voulez-vous vraiment continuer ?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Annuler</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Refaire</translation> </message> @@ -4633,63 +4641,63 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Passer en mode hors-ligne</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Se connecter à</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Se déconnecter de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ouvrir un nouveau fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Ouvrir un fichier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Annuler</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> <source>Don't save an empty log to the cloud</source> <translation>Ne pas enregistrer un journal vide dans le cloud</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Traverser les dossiers d'images</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scanner</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Analyse des images ... (merci de patienter)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Avertissement</translation> </message> @@ -4699,100 +4707,100 @@ cette opération. Voulez-vous vraiment continuer ?</translation> <translation>Tentative de fusion des plongées compris dans un intervalle de temps de %1 minutes</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant de fermer le fichier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Veuillez enregistrer ou annuler vos modifications en cours avant d'ajouter une nouvelle plongée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Imprimer le tableau de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Tentative de replanification d'une plongée qui n'est pas une plongée planifiée.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Merci de finir l'édition en cours avant d'en commencer une autre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Tentative de modification d'une plongée qui n'a pas été ajoutée manuellement.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Statistiques annuelles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Voulez-vous enregistrer les modifications du fichier %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Voulez-vous enregistrer les modifications du fichier de données ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Enregistrer les modifications ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Les modifications seront perdues si vous ne les enregistrez pas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Enregistrer le fichier sous</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fichiers XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[cache local pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[stockage dans le cloud pour] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Ouverture du fichier de données à partir d'une version antérieure</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Vous avez ouvert un fichier de données d'une version plus ancienne de Subsurface. Nous vous recommandons de lire le manuel à propos des modifications apportées par la nouvelle version, particulièrement à propos de la gestion des sites de plongées qui a été grandement modifiée. Subsurface a déjà essayé de pré-remplir les données mais il est préférable que vous regardiez le nouveau système de gestion des sites de plongées pour vous assurer que tout est correct.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Ouvrir le fichier de carnet de plongée</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Fichiers log de plongée (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> @@ -4805,7 +4813,7 @@ Subsurface a déjà essayé de pré-remplir les données mais il est préférabl <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Déplacer le lieu de plongée sélectionné</translation> </message> @@ -5123,32 +5131,12 @@ Si votre périphérique utilise le Bluetooth, effectuez la même préparation qu </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Recherche géographique du site de plongée</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Activer le géocodage pour la gestion des sites de plongées</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Analyser les sites sans données GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Même format pour les plongées existantes</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> <source>Dive site layout</source> <translation>Structure des sites de plongées</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5452,7 +5440,7 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Stockage Subsurface dans le cloud</translation> </message> @@ -5533,6 +5521,16 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Stockage Subsurface dans le cloud (Informations de connexion vérifiés)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5847,17 +5845,17 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>L'affichage de la LND/DTR est désactivée à cause d'un temps de calcul excessif</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Ajouter un changement de gaz</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Bloc %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Choisir comme odinateur principale</translation> </message> @@ -5872,83 +5870,83 @@ Voir : http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Plongée ajoutée manuellement </translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Supprimer cet ordinateur de plongée</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Ajouter un changement de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Ajouter un signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Modifier le profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Supprimer l'évènement</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Masquer les évènements similaires</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Modifier le nom</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajuster la pression du bloc %1 (actuellement interpolé comme %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Afficher tous les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Masquer les évènements</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Masquer tous les évènements %1 ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Supprimer l'évènement sélectionné ?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Modifier le nom du signet</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nom personnalisé :</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Le nom est trop long !</translation> </message> @@ -6679,64 +6677,64 @@ Fichiers avec dates/heures incorrectes</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Petit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Moyen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Date de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Lieu de plongée : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Équipier(s) : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Guide/Moniteur : %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7459,7 +7457,7 @@ mélangés à partir de l'air et en utilisant : <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1cliquer pour visiter %2</translation> </message> @@ -8740,7 +8738,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>inconnu</translation> @@ -9000,7 +8998,7 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Impossible d'analyser '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Impossible d'ouvrir le feuille de style %s</translation> </message> @@ -9051,6 +9049,11 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Planification de la plongée</b>(Chevauchement de plongées détecté)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime : %dmin<br></div></translation> @@ -9175,11 +9178,6 @@ Vous pouvez créer ce fichier log en sélectionnant la case correspondante dans <translation>Plannification de la plongée </b> crée le</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime : %dmin VARIATIONS<br></div></translation> - </message> - <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modèle de déco : Bühlmann ZHL-16C avec GF Low = %d%% et GF High = %d%%</translation> @@ -9852,6 +9850,31 @@ EADD : %d%s / %.1fg/ℓ <translation>État de plongée</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR (Recycleur)</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Apnée</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Tous (stats des voyages)</translation> @@ -9887,97 +9910,97 @@ EADD : %d%s / %.1fg/ℓ <translation>(pas de plongées)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Dim.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Lun.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Mar.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Mer.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Jeu.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Ven.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sam.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Janv.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Fév.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Avril</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Juin</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Juil.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Août</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sept.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov.</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Déc.</translation> </message> @@ -10353,22 +10376,22 @@ Est-ce que l'Uemis Zurich est branché correctement ?</translation> <translation>Ville</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Début de la sauvegarde des données</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Début de la sauvegarde des plongées</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Cache local crée</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Préparation de la sauvegarde des données</translation> </message> diff --git a/translations/subsurface_he.ts b/translations/subsurface_he.ts index 9a8dd1d21..4d011ae81 100644 --- a/translations/subsurface_he.ts +++ b/translations/subsurface_he.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ליטר</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>לחיצה פה תסיר את המיכל הזה</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>עומק מעבר לגז דקו. מחושב באמצעות העדפת דקו pO₂, אלא אם כן נקבע באופן ידני.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>מחושב באמצעות העדפת pO₂ תחתית. הגדרת MOD מתאים% ה- O₂, הגדיר '*' עבור ה- O₂% לעומק מרבי הטוב ביותר.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>מחושב באמצעות העדפת END Mix Best. הגדרת MND המתאים He%, הגדיר '*' עבור מיטב He% לעומק מרבי.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>הגז בשימוש. רק ניתן להסיר מיכלים שלא בשימוש בצלילה.</translation> </message> @@ -2051,67 +2059,67 @@ GPS הנוכחי:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>אין פרופיל לתצוגה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>חליפה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>טמפ' האוויר:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>מיכל:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>טמפ' מים:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>הצג מפה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>דירוג</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>מדריך צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>משקל:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>בן זוג:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>צריכת אויר:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>הערות</translation> </message> @@ -2119,23 +2127,23 @@ GPS הנוכחי:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(מכל %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>מעבר ידני למערכת פתוחה</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> התחלה</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> סיום</translation> @@ -2173,23 +2181,23 @@ GPS הנוכחי:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>רשימת צלילות</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>אין צלילות ברשימת צלילה</translation> </message> @@ -2197,102 +2205,102 @@ GPS הנוכחי:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>הצג הכל</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>הסתר הכל</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>הסתר אחרים</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>הסר צלילה/צלילות מטיול</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>צור טיול חדש למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>הוסף צלילה/צלילות לטיול למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>הוסף צלילה/צלילות לטיול למטה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>אגד את הטיול עם הטיול למעלה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>אגד את הטיול עם הטיול למטה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>מחיקת צלילה/צלילות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>סמן את הצלילות כלא תקינות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>אגד צלילות הנבחרות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>מספר צלילה/צלילות מחדש</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>הזחת זמן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>פצל צלילות נבחרות</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>טען תמונה/תמונות מ-קובץ/קבצים</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>טען תמונה מאינטרנט</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 אינו תמונה</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>פתח קבצי תמונה</translation> </message> @@ -2300,12 +2308,12 @@ GPS הנוכחי:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>יצירת אתר צלילה חדש, העתקת מידע רלוונטי מהצלילה הנוכחית.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>יצירת אתר צלילה חדש בשם זה</translation> </message> @@ -2965,27 +2973,33 @@ GPS הנוכחי:</translation> <translation>לא ידוע</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>עומק מירבי</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>זמן צלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>גז שנוצל</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>נקודה קבועה למערכת סגורה</translation> </message> @@ -3021,112 +3035,107 @@ GPS הנוכחי:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>עומק</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>זמן</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>לחץ</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>טמפרטורה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>צבע</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>הוכנס על ידי המשתמש</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>מספר מיכל</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>לחץ S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>לחץ I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>תקרה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>צריכת אויר</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>נקודה קבועה</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>חיישן 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>חיישן 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>חיישן 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>לחץ סביבתי</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>קצב לב</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>גרדיאנט</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>עומק ממוצע @ שניות</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>כישלון בכתיבת קובץ zip: %s שגיאת zip %d שגיאת מערכת%d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>סיים</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>העלאת רשימת צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>הורדת רשימת צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>הורדת %1 צלילות...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>ההורדה הסתיימה - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>תקלה בהורדה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>אין אפשרות לפתוח את הארכיב </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>הורדה פגומה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>אין אפשרות לפתוח את הארכיב: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>ההעלאה הסתיימה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>ההעלאה נכשלה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>ההעלאה הסתיימה בהצלחה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>שגיאת התחברות (הזדהות)</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>תשובה לא ברורה</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>שגיאה: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>הורדה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>בחר מצב הורדה ל-Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>שגיאה</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>חפש מחשב צלילה Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>בטל הורדה</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>הורדה</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>בטל</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>שם יצרן :</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>מחשב צלילה:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>נסה שוב</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>יציאה</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>צלילות שהורדו</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>אישור</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>בחר הכל</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>בטל בחירת הכל</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>להתחבר לפייסבוק מציין מיקום טקסט </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>על מנת לנתק Subsurface מחשבון הפייסבוק שלך, השתמש 'Share' בתפריט.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>כדי להתחבר לפייסבוק, אנא התחבר. זה מאפשר Subsurface לפרסם צלילות לציר הזמן שלך</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>ניהול אתרי צלילה</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } האם אתה בטוח שאתה רוצה להמשיך?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>הנך עורך אתר צלילה</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>אתר צלילה חדש</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>בטל שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>אתה עומד לבטל את השינויים.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>פתח</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>בטל שינוי</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>בצע שינוי שוב</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>העבר אחסון בענן למצב פעיל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>התחבר אל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>התנתק מ-</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני פתיחת קובץ חדש.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>פתח קובץ</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>בטל</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>פצל ספריות של תמונת</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>סרוק</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>סורק תמונות... (יכול להיות תהליך ארוך)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>אזהרה</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation>מנסה למזג צלילות עם מרווח של 1% דקות ביניהם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני סגירת הקובץ.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>נא לשמור או לבטל את עריכת הצלילה הנוכחית לפני הוספת צלילה.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>הדפס טבלת זמנים</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>מנסה לערוך מחדש צלילה שאינה צלילה מתוכננת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>ראשית סיים את המהדורה הנוכחית לפני יצירת אחרת.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>מנסה לערוך צלילה שלא הוספה ידנית.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>סטטיסטיקה שנתית</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>האם ברצונך לשמור שינויים בקובץ %1 ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>האם לשמור שינויים בקובץ?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>שמור שינוים?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>כל השינויים יאבדו אם לא תשמרו אותם.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>שמור קובץ בשם</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>קבצי XML נתמכים (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[עותק מקומי עבור] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[אחסון בענן ל-] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>פותח קובץ מגרסה ישנה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>אתה פתחת קובץ נתונים מגירסה ישנה יותר של Subsurface. אנו ממליצים לך לקרוא את המדריך כדי ללמוד על השינויים בגרסה החדשה, במיוחד על ניהול אתר צלילה שהשתנה רבות. Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כדאי לבחון את מערכת ניהול אתרי הצלילה החדשה ולוודא שהכל נראה תקין.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>פתח קובץ יומן צלילה</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>קבצי יומני צלילה (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN*.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;קבצי Cochran (*.can *.CAN);;קבצי CSV (*.csv *.CSV);;קבצי DiveLog.de (*.dld *.DLD);;קבצי JDiveLog (*.jlb *.JLB);;קבצי Liquivision (*.lvd *.LVD);;קבצי MkVI (*.txt *.TXT);;קבצי Suunto (*.sde *.db *.SDE *.DB);;קבצי Divesoft (*.dlf *.DLF);;קבצי UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;קבצי XML (*.xml *.XML);;קבצי APD (*.apd *.APD);;קבצי Datatrak/WLog (*.log *.LOG);;קבצי OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;כל קבצים (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>מתחבר לאחסון בענן</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface כבר ניסתה לאכלס מראש את הנתונים אבל כד <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>חיפוש גיאו עבור אתר צלילה</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>אפשר קידוד גיאו לניהול אתרי צלילה</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>לנתח אתר בלי נתוני GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>אותו פורמט לצלילות קיימות</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>פורמט אתר צלילה</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>אחסון בענן ל-Subsurface</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>אחסון בענן ל-Subsurface (זיהוי מאומת)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>יבא</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>יבא קובץ תבנית</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>קבצי HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>יצא קבצי תבנית כ-</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>לא ניתן לבטל פעולה זו!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>מחק תבנית: %1?</translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation>(#%1 מתוך %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>מחשב צלילה לא מוכר</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>הצגת NDL / TTS הושבתה בגלל זמן עיבוד חריג</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>הוסף שינוי גז</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(מיכל %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>בחר מחשב צלילה ראשונה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>צלילה מתוכננת</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>צלילה הוזן ידנית</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>מחק מחשב צלילה זה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>הוסף שינוי נקודה קבועה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>הוספת סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>ערוך פרופיל צלילה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>הסר את האירוע</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>הסתר אירועים דומים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>ערוך שם</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>שינוי לחץ במיכל %1 (כרגע מחושב כ-%2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>חשוף את כל האירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>הסתר אירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>הסתר את כל %1 האירועים</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>הסר את האירוע שנבחרו?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>שינוי שם סימנייה</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>שם חופשי:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>שם ארוך מדי!</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>מתחיל...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>עובד במצב של חוסר תקשורת עם הענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>שגיאה בקריאת קובץ מקומי, מבטל</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>אין פרטי זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>נא להזין פרטי זיהוי חוקיים לענן.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>דואר אלקטרוני וסיסמא לאחסון בענן יכולים רק מורכבים מאותיות, מספרים, ו, '.' '-', '_', ו '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>מנסה להתחבר לענן עם זיהוי חדש</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>בודק זיהוי לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>אין תגובה משרת ענן כדי לאמת את האישורים</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>אין אפשרות להתחבר לענן - חשבון ענן לא מאומת</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>זיהוי לענן לא חוקי</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>אין אפשרות להתחבר לענן: תקלה ביצירת קשר https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>אין אפשרות להתחבר לענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>אין אפשרות להתחבר לענן</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>שגיאת איחסון ענן: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>שגיאה בחיבור לשרת ענן, חוזר למצב של עבודה מקומית</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>חיבור לענן נוצר בהצלחה. אין צלילות ברשימת הצלילות.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>שעה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>דקה</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>שניות</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>נ"צ לא מוכר</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>תגובת XML פגומה. שורה %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>תגיות</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>בינוני</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>תאריך צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>משך: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>שעה</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>דקה</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>אתר צלילה: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>בן זוג: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>דייבמאסטר: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7441,7 +7455,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1 לחץ כדי להציג %2</translation> </message> @@ -8395,8 +8409,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>חמצן</translation> </message> @@ -8481,15 +8495,15 @@ Maximum</source> <translation>קילוגרם</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) או (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>אויר</translation> </message> @@ -8718,7 +8732,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>לא ידוע</translation> @@ -8976,7 +8990,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>נכשל ניסיון לנתח '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>לא ניתן לפתוח את גיליון העיצוב %s</translation> </message> @@ -8992,21 +9006,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>אזהרה:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, GF אפקטיבי=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>שינוי SP</translation> @@ -9022,195 +9036,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>זמן %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>עומק</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>משך הצלילה</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>זמן צלילה</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>גז</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>עבור ל- %.*f %s ב- %d:%02d דקות - זמן בצלילה %d:%02u על %s (SP = %.1f בר)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>עבור ל- %.*f %s ב- %d:%02d דקות - זמן בצלילה %d:%02u על %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>המתן ב- %.*f %s ל- %d:%02d דקות - זמן בצלילה %d:%02u על %s (SP = %.1f בר)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>המתן ב- %.*f %s ל- %d:%02d דקות - זמן בצלילה %d:%02u על %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3d דקות</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fבר)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>מעבר גז ל- %s (SP = %.1f בר)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>לעבור לגז s%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>מודל דקו: VPM-B בשמרנות נומינלית</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>צריכת אויר</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>תכנון צלילה</b>(זמן מעל פני המים</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>נוצר ב</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>תכנון צלילה</b> נוצר ב-</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>מודל דקו: Bühlmann ZHL-16B עם גרדיאנט תחתון=%d%% וגרדיאנט עליון =%d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>מודל דקו: VPM-B ב-+%d שמרנות</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>מודל דקו: מצב ספורטיבי מבוסס על Bühlmann ZHL-16B עם גרדיאנט תחתון= %d%% וגרדיאנט עליון = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>לחץ אטמוספרי %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>צריכת גז (לא כולל זמן במערכת סגורה):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>צריכת גז (מבוסס SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>זה יותר גז מהזמין במיכל הנבחר!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>לא מספיק עתודות לשיתוף גז בעלייה!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>גז מינימלי הנדרש עבור העלייה כבר עולה על הלחץ ההתחלתי של המיכל!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s מ- <span style='color: red;'><b>%s</b></span>(%.0f%s/%.0f%s בעליה מתוכננת)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s בעליה מתוכננת) של <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>pO₂ גבוה %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>pO₂ נמוך %.2f ב- %d:%02u עם גז %s בעומק %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>לא ניתן למצוא את הגז %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9807,6 +9837,31 @@ EADD: %d%s / %.1fg/ℓ <translation>סטטוס צלילה</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>מערכת פתוחה</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>מערכת סגורה</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>מערכת חצי סגורה</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>צלילה חופשית</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>הכל (לפי נתוני טיולים)</translation> @@ -9842,97 +9897,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(שום צלילות)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>ראשון</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>שני</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>שלישי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>רביעי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>חמישי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>שישי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>שבת</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>ינואר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>פבואר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>מרץ</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>אפריל</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>מאי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>יוני</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>יולי</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>אוגוסט</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>ספטמבר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>אוקטובר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>נובמבר</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>דצמבר</translation> </message> @@ -10162,6 +10217,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>משך הצלילה:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>דקה</translation> @@ -10267,7 +10323,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>עומק</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>נקודת ציון המתוכנן מעל התקרה</translation> </message> @@ -10307,22 +10363,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>עיר</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hr_HR.ts b/translations/subsurface_hr_HR.ts index 142d12545..1898dad21 100644 --- a/translations/subsurface_hr_HR.ts +++ b/translations/subsurface_hr_HR.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1779,27 +1787,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -2044,67 +2052,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Težina:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Bilješke</translation> </message> @@ -2112,23 +2120,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> započni</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> završi</translation> @@ -2166,23 +2174,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2190,102 +2198,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Otvori sve</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Zatvori sve grupe</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Kreiraj novu grupu iznad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Spoji s grupom iznad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Spoji s grupom ispod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation type="unfinished"/> </message> @@ -2293,12 +2301,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2958,27 +2966,33 @@ GPS location:</source> <translation>nepoznato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Trajanje</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3014,112 +3028,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Dubina</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Vrijeme</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pritisak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3352,80 +3361,80 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3433,33 +3442,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Greška</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3566,7 +3575,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3592,7 +3601,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3607,52 +3616,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Pokušaj ponovo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Izlaz</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3683,12 +3692,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3696,22 +3705,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3962,7 +3971,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3983,7 +3992,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4211,12 +4220,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4275,7 +4284,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4571,13 +4580,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4617,58 +4626,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4678,104 +4692,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4783,7 +4797,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5098,32 +5112,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5425,7 +5419,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5506,6 +5500,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5776,28 +5780,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5805,12 +5809,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5820,108 +5824,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5929,147 +5933,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6227,6 +6231,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6639,59 +6653,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6783,12 +6797,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7411,7 +7425,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8350,8 +8364,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8436,15 +8450,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) ili (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>zrak</translation> </message> @@ -8673,7 +8687,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nepoznato</translation> @@ -8929,7 +8943,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Nije uspjelo parsiranje '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8945,21 +8959,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8975,195 +8989,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> - <source>depth</source> + <source>Runtime: %dmin %s</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> + <source>depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9730,6 +9760,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9765,97 +9820,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nema urona)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Ned</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Uto</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Sri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Čet</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Pet</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sub</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Sij</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Velj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Ožu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Tra</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Svi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Lip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Srp</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Kol</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Ruj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Stu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Pro</translation> </message> @@ -10080,6 +10135,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10185,7 +10241,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Dubina</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10225,22 +10281,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_hu.ts b/translations/subsurface_hu.ts index b8f2c2040..4af350199 100644 --- a/translations/subsurface_hu.ts +++ b/translations/subsurface_hu.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1783,27 +1791,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -2048,67 +2056,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation type="unfinished"/> </message> @@ -2116,23 +2124,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>kezdés</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>befejezés</translation> @@ -2170,23 +2178,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Merülés lista</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2194,102 +2202,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Mind kinyit</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Összes összecsukása</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Túra létrehozása fentebb</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Túra egyesítése a fentivel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Túra egyesítése a lentivel</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation type="unfinished"/> </message> @@ -2297,12 +2305,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2962,27 +2970,33 @@ GPS location:</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Tartam</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3018,112 +3032,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Mélység</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Idő</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3356,80 +3365,80 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3437,33 +3446,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Hiba</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3570,7 +3579,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3596,7 +3605,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3611,52 +3620,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Kilépés</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3687,12 +3696,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3700,22 +3709,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3966,7 +3975,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3987,7 +3996,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4215,12 +4224,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4279,7 +4288,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4575,13 +4584,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4621,58 +4630,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4682,104 +4696,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4787,7 +4801,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5102,32 +5116,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5429,7 +5423,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5510,6 +5504,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5780,28 +5784,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5809,12 +5813,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5824,108 +5828,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5933,147 +5937,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6231,6 +6235,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6643,59 +6657,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6787,12 +6801,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7415,7 +7429,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8354,8 +8368,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8440,15 +8454,15 @@ Maximum</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) vagy (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation type="unfinished"/> </message> @@ -8677,7 +8691,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation type="unfinished"/> @@ -8932,7 +8946,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>'%s' értelmezése meghiúsult.</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8948,21 +8962,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8978,195 +8992,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> - <source>depth</source> + <source>Runtime: %dmin %s</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> + <source>depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation type="unfinished"/> </message> @@ -9733,6 +9763,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9768,97 +9823,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nincs merülés)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>H</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>P</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Már</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Ápr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jún</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Júl</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10083,6 +10138,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation type="unfinished"/> @@ -10188,7 +10244,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Mélység</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10228,22 +10284,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_id.ts b/translations/subsurface_id.ts index 4ffe4a2e8..bcac9039a 100644 --- a/translations/subsurface_id.ts +++ b/translations/subsurface_id.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1779,27 +1787,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation type="unfinished"/> </message> @@ -2044,67 +2052,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Catatan</translation> </message> @@ -2112,23 +2120,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>Mulai</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>Akhir</translation> @@ -2166,23 +2174,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2190,102 +2198,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation type="unfinished"/> </message> @@ -2293,12 +2301,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2958,27 +2966,33 @@ GPS location:</source> <translation>Tak dikenal</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Durasi</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3014,112 +3028,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>edalaman</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Waktu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Tekanan</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Suhu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3352,80 +3361,80 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3433,33 +3442,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Kesalahan</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3566,7 +3575,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3592,7 +3601,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Batal</translation> </message> @@ -3607,52 +3616,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3683,12 +3692,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3696,22 +3705,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3962,7 +3971,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3983,7 +3992,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4211,12 +4220,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4275,7 +4284,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Buka</translation> </message> @@ -4571,13 +4580,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4617,58 +4626,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Batal</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4678,104 +4692,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Perubahan akan hilang jika anda tidak simpan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML files (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4783,7 +4797,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5098,32 +5112,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5425,7 +5419,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5506,6 +5500,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5776,28 +5780,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5805,12 +5809,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5820,108 +5824,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5929,147 +5933,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>menit</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6227,6 +6231,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tag</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6639,59 +6653,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>menit</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6783,12 +6797,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7411,7 +7425,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8358,8 +8372,8 @@ Rata-rata</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8444,15 +8458,15 @@ Rata-rata</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) or (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>udara</translation> </message> @@ -8681,7 +8695,7 @@ Rata-rata</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>Tak dikenal</translation> @@ -8936,7 +8950,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8952,21 +8966,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8982,195 +8996,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> - <source>depth</source> + <source>Runtime: %dmin %s</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> + <source>depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation type="unfinished"/> </message> @@ -9737,6 +9767,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9772,97 +9827,97 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation type="unfinished"/> </message> @@ -10087,6 +10142,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>menit</translation> @@ -10192,7 +10248,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>edalaman</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10232,22 +10288,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_it_IT.ts b/translations/subsurface_it_IT.ts index 29e427f37..146f61318 100644 --- a/translations/subsurface_it_IT.ts +++ b/translations/subsurface_it_IT.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Cliccando qui si rimuove la bombola.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profondità del cambio gas. Calcolata a partire dalla pO₂ in deco scelta nelle preferenze o impostata manualmente.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calcolata usando la pO₂ sul fondo scelta nelle preferenze. La MOD regola O₂%, impostare '*' per avere la migliore O₂% alla massima profondità.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calcolata usando Best Mix END scelta nelle preferenze. La MND regola He%, impostare '*' per avere la migliore He% alla massima profondità.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Questo gas è in uso. Solo le bombole che non sono in uso nell'immersione possono essere rimosse.</translation> </message> @@ -2052,67 +2060,67 @@ del GPS:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Nessun profilo da mostrare</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Muta:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Temp. aria:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Bombola:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Temp. acqua:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Mappalo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Valutazione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Visibilità:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Compagno:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>CAS:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Note</translation> </message> @@ -2120,23 +2128,23 @@ del GPS:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (bot. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Switch manuale a OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>inizio</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>fine</translation> @@ -2174,23 +2182,23 @@ del GPS:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Lista immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Credenziali per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Premi il tasto '+' per una nuova immersione (o scarica le immersioni da un computer supportato)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Nessuna immersione in lista</translation> </message> @@ -2198,102 +2206,102 @@ del GPS:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Espandi tutto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Minimizza tutto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Collassa altri</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Rimuove immersione(i) dal viaggio</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Crea un nuovo viaggio sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Aggiungi l'immersione(i) al viaggio subito sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Aggiungi l'immersione(i) al viaggio subito sotto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Raggruppa il viaggio con il viaggio sopra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Raggruppa il viaggio con il viaggio sotto</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Cancella immersione(i)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marca l'immersione(i) come non valide</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Fondi le immersioni selezionate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Rinumera le immersioni</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Sposta i tempi di immersione</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Dividi le immersioni selezionate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Carica immagine(i) da file(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Carica immagine dal web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>file di immagine (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 non sembra essere una immagine</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Apri files di immagine</translation> </message> @@ -2301,12 +2309,12 @@ del GPS:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crea un nuovo sito di immersione copiando le principali informazioni dall'immersione corrente.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Crea un nuovo sito d'immersione con questo nome</translation> </message> @@ -2966,27 +2974,33 @@ del GPS:</translation> <translation>sconosciuto</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>bombola</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Profondità finale</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Run Time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Durata</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gas utilizzato</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ del GPS:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Profondità</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Ora</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pressione</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Colore</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Inserito dall'utente</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Indice della bombola</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Pressione S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Pressione I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Ceiling</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>CAS</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensore 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensore 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensore 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Pressione ambiente</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Battito cardiaco</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Profondità media/e</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>errore nella scrittura del file zip: %s zip error %d system error %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Fatto</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Sto caricando la lista immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Sto scaricando la lista immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Sto scaricando %1 immersioni...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Scaricamento finito - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problemi con il download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>L'archivio non può essere aperto: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Scaricamento corrotto</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>L'archivio non può essere aperto: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Caricamento finito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Caricamento fallito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Caricamento eseguito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Accesso fallito</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Non riesco ad analizzare la risposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Errore: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Download</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Scegli la modalità di download per il Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Connessione allo strumento in corso</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Errore</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Cerca computer Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Annulla il download</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Download</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Annulla</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation>Il Bluetooth non è abilitato</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Marca:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Computer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Connessione:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Riprova</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Esci</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Immersioni scaricate</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Accetta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Seleziona tutto</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Deseleziona tutto</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Connetti ad un segnaposto testuale Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Per disconnettere Subsurface dal tuo account Facebook, usa la voce di menu 'Condividi'</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Per connetterti a Facebook, per favere inserisci le tue credenziali. Questo permette a Subsurface di pubblicare le immersioni sulla tua bacheca</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Accesso a facebook eseguito con successo</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Login fallito, utente sconosciuto</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Immersioni caricate correttamente su Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Caricamento delle immersioni fallito. Invia le informazioni di debug alla mailing list di Subsurface</translation> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Gestione dei siti di immersione</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Sei sicuro di voler continuare?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Stai modificando un sito di immersione</translation> </message> @@ -4226,12 +4235,12 @@ Sei sicuro di voler continuare?</translation> <translation>Nuovo sito d'immersione</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Elimino le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Stai per cancellare le modifiche.</translation> </message> @@ -4290,7 +4299,7 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Apri</translation> </message> @@ -4586,13 +4595,13 @@ Sei sicuro di voler continuare?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Annulla</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Ripeti</translation> </message> @@ -4632,58 +4641,63 @@ Sei sicuro di voler continuare?</translation> <translation>Porta la memoria cloud online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Connetti a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Disconnetti da</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aprire un nuovo file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Apri file</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Annulla</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Non salvare un log vuoto nel cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Visita le cartelle delle immagini</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scansione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Lettura delle immagine (può impiegarci parecchio)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Avviso</translation> </message> @@ -4693,105 +4707,105 @@ Sei sicuro di voler continuare?</translation> <translation>Sto cercando di unire delle immmersioni con un intervallo di %1min tra di loro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di chiudere il file.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Per favore, salva o cancella le modifiche all'immersione prima di aggiungerne un'altra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Stampa la tabella con il runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Si sta cercando di ripianificare una immersione che non è una immersione pianificata.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Per favore, prima completa le modifiche corrente prima di aggiungerne altre.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Sto cercando di modificare una immersione che non è stata creata manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Statistiche Annuali</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vuoi salvare le modifiche fatte nel file %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vuoi salvare le modifiche fatte nel file di dati?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Salvo le modifiche?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Le modifiche saranno perse se tu non le salvi.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Apri file come</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>File XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[cache locale for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[memoria cloud per] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Apertura di un file di dati da una vecchia versione</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Hai aperto un file di dati da una vecchia versione di Subsurface. Ti consigliamo di leggere il manuale per approfondire le modifiche apportate alla nuova versione, con particolare riguardo alla gestione dei siti di immersione che è cambiata in modo significativo. Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe il caso di dare un'occhiata alla gestione dei siti di immersione per controllare che tutto sia a posto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Apri file di log immersioni</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Sto contattando il servizio cloud...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface ha già cercato di convertire i dati in maniera automatica ma sarebbe <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Trascina il punto di immersione selezionato</translation> </message> @@ -5117,32 +5131,12 @@ Se il tuo strumento usa il Bluetooth, prima di eseguire l'aggiornamento, es </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Ricerca geografica dei siti di immersione</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Abilita georeferenzazione per la gestione di siti di immersione</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Analizza i siti senza coordinate GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Stesso formato per le immersioni esistenti</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation>Layout del sito di immersione</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5446,7 +5440,7 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Memoria cloud di Subsurface</translation> </message> @@ -5527,6 +5521,16 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <source>Subsurface cloud storage (credentials verified)</source> <translation>Memoria cloud di Subsurface (credenziali verificate)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5797,28 +5801,28 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <translation>Importa</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importa il file modello</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>File HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Esporta il file modello come</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Questa azione non può essere annullata!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Cancella il modello: %1?</translation> </message> @@ -5826,12 +5830,12 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation>(nº%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Computer sconosciuto</translation> </message> @@ -5841,108 +5845,108 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <translation>La visualizzazione NDL / TTS è stata disabilitata perchè i calcoli richiedono troppo tempo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Aggiungi un cambio gas</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Bombola %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Rendi il computer principale</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Immersione pianificata</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Immersione inserita manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Cancella questo computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Aggiungi cambio setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Aggiungi un segnalibro</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Modifica il profilo</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Rimuovi evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Nascondi eventi simili</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Modifica il nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Corregge la pressione della bombola %1 (attualmente interpolata come %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Mostra tutti gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Nascondi gli eventi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Nascondi tutti gli eventi %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Rimuovere l'evento selezionato?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Modifica il nome del bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nome personalizzato:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Il nome è troppo lungo</translation> </message> @@ -5950,147 +5954,147 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Avvio...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Apri file di log immersioni locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Apertura del file locale fallita</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 immersioni caricate dal file locale</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>sto lavorando in modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Errore nella decodifica dell'archivio locale, abbandono</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Credenziali cloud mancanti</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Prego inserire credenziali valide per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Email e password per la memoria cloud possono contenere solo lettere, numeri, '.', '-', '_', e '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Formato email errato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Sto cercando di aprire la memoria cloud con le nuove credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Controlle le credenziali per il cloud</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Nessuna risposta del server cloud per la validazione delle credenziali</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Credenziali per il cloud errate</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Non è possibile connettersi al cloud storage - account cloud non verificato</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Le credenziali per il cloud non sono valide</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Non è possibile aprire il cloud storage: errore nella creazione della connessione https</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Non è possibile aprire il cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Non è possibile connettersi al cloud storage</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Credenziali per il cloud valide, sto caricando le immersioni</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Errore cloud storage: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Sto caricando le immersioni dalla memoria locale (modalità "no cloud")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Impossibile connettersi al server cloud, passo alla modalità off-line</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Memoria cloud aperta con successo. Non ho trovato immersioni.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Posizione GPS sconosciuta</translation> </message> @@ -6248,6 +6252,16 @@ Dai un'occhiata a http://doc.qt.io/qt-5/qdatetime.html#toString</translatio <source>Malformed XML response. Line %1: %2</source> <translation>Risposta XML malformata. Linea %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Nessun layout del sito di immersione salvato nelle preferenze!</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tags</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6664,64 +6678,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Piccolo</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data dell'immersione: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durata: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Luogo immersione: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Compagno: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6814,12 +6828,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>Per utilizzare Subsurface-mobile con il Subsurface cloud storage, inserisci le tue credenziali per il cloud.<br/><br/>Se questa è la prima volta che usi la memoria cloud di Subsurface, inserisci un indirizzo email valido (tutte lettere minuscole) e una password (lettere e numeri).<br/><br/>Per usare Subsurface-mobile solo con i dati locali su questo dispositivo, seleziona il tasto no cloud in alto.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Grazie per esserti registrato. Abbiamo inviato a <b>%1</b> un codice PIN per completare la registrazione. Se non ricevi una email da noi entro 15 minuti controlla prima l'indirizzo di posta digitato e la tua cartella dello spam.<br/><br/>Nel caso di problemi con la registrazione, contattaci al forum di assistenza (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7444,7 +7458,7 @@ mixati con aria e usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1click per visitare %2</translation> </message> @@ -8399,8 +8413,8 @@ Media</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>ossigeno</translation> </message> @@ -8485,15 +8499,15 @@ Media</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) o (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>aria</translation> </message> @@ -8722,7 +8736,7 @@ Media</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>sconosciuto</translation> @@ -8983,7 +8997,7 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>Impossibile analizzare '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Non é possibile aprire il foglio di stile %s</translation> </message> @@ -8999,21 +9013,21 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Avviso</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, GF reale=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Cambio SP</translation> @@ -9029,195 +9043,211 @@ Puoi crearne uno selezionando il corrispondente checkbox nella maschera di downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>piano di immersione</b> (Trovate Immersioni che si sovrappongono)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>profondità</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>durata</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Passare a %.*f %s in %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Passaggio a %.*f %s al %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u su %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Rimani a %.*f %s per %d:%02d min - runtime %d:%02u con %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Cambio gas a %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Passa al gas %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Modello di decompressione: VPM-B con conservativismo normale</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Minimum gas</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>basato su</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>CAS</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>piano di immersione</b> (intervallo di superficie </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>creato il</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>piano di immersione</b> creato il</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIAZIONI<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modello decompressivo: Bühlmann ZHL-16C con GFLow = %d%% e GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Modello di decompressione: VPM-B con +%d di conservativismo</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modello decompressivo: modo ricreativo basato su Bühlmann ZHL-16B con GFLow = %d%% e GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Pressione ATM: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Consumo del gas (CCR legs escluse):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Consumo gas (basato su CAS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>il gas necessario è superiore a quello disponibile nella bombola</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>riserva di gas non sufficiente per la condivisione in risalita</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (calcolato in base a %.1fxCAS/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>minimum gas necessario per la risalita maggiore della pressione della bombola!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s di <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s nella risalita pianificata)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s durante la risalita pianificata) di <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Valore pO₂ basso %.2f a %d:%02u con il gas %s aalla profondità %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Non trovo il gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9820,6 +9850,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Stato dell'immersione</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Apnea</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Tutti (dalle statistiche dei viaggi)</translation> @@ -9855,97 +9910,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nessuna immersione)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Lun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Mer</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Gio</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Ven</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sab</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Gen</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mag</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Giu</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Lug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Ott</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dic</translation> </message> @@ -10175,6 +10230,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Durata:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10280,7 +10336,7 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Profondità</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>Waypoint pianificato sopra il ceiling</translation> </message> @@ -10320,22 +10376,22 @@ Lo Uemis Zurich e' collegato correttamente?</translation> <translation>Città</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Inizio salvataggio dei dati</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Inizio salvataggio delle immersioni</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Creazione della cache locale riuscita</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Preparazione al salvataggio dei dati</translation> </message> diff --git a/translations/subsurface_nb_NO.ts b/translations/subsurface_nb_NO.ts index 1c1c780fd..e64df1f6b 100644 --- a/translations/subsurface_nb_NO.ts +++ b/translations/subsurface_nb_NO.ts @@ -377,6 +377,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1784,27 +1792,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Klikk her for å fjerne denne flaska.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Dybde for bytte av dekogass. Kalkulert ved hjelp av valgt deko-pO₂, hvis den ikke er satt manuelt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Utregnet fra valgt bunn-pO₂. Ved å sette MOD justeres O₂%. Sett til '*' for best O₂% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Utregnet for valgt best miks END. Ved å sette MND justeres He%. Sett til '*' for best He% ved maks dybde.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Gassen er i bruk. Bare flasker som ikke er i bruk kan fjernes.</translation> </message> @@ -2050,67 +2058,67 @@ GPS-posisjon:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>In profil tilgjengelig</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Drakt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Flaske:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Vanntemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>På kart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Vurdering:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Sikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Dykkeleder:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Vekt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notater</translation> </message> @@ -2118,23 +2126,23 @@ GPS-posisjon:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(flaske %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manuelt bytte til OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> slutt</translation> @@ -2172,23 +2180,23 @@ GPS-posisjon:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Liste over dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Påloggingsinformasjon i skyen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Trykk '+'-knappen for å legge til et dykk (eller last ned dykk fra en dykkecomputer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Ingen dykk i lista</translation> </message> @@ -2196,102 +2204,102 @@ GPS-posisjon:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Fold ut turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Fold sammen turer</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Slå sammen andre</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Fjern dykk fra tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Lag ny tur</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Legg til dykk til turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Legg til dykk til turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Slå samme tur med turen over</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Slå sammen tur med turen under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Slett dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marker dykk som ugyldige</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Slå sammen valgte dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renummerer dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Flytt på dykketider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Del opp valgte dykk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Hent bilde(r) fra fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Hent bilde fra web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Bildefiler (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 er ikke et bilde</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Åpne bilder</translation> </message> @@ -2299,12 +2307,12 @@ GPS-posisjon:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Lag et nytt dykkested, og kopier relevant informasjon fra dette dykket</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Opprett dykkested med dette navnet</translation> </message> @@ -2964,27 +2972,33 @@ GPS-posisjon:</translation> <translation>ukjent</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Siste dybde</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Løpetid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Varighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gassforbruk</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC settpunkt</translation> </message> @@ -3020,112 +3034,107 @@ GPS-posisjon:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Dybde</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Trykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Farge</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Brukeren la inn</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Flaskeindeks</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Trykk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Trykk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Settpunkt</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Omgivelsestrykk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Hjertefrekvens</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Snittdypde @ s</translation> </message> @@ -3362,82 +3371,82 @@ p, li { white-space: pre-wrap; } <translation>kunne ikke skrive zip-fil: %s zip-feil %d system-feil %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Laster opp liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Laster ned liste over dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Laster ned %1 dykk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Nedlasting er ferdig - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Kunne ikke laste ned</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arkivet kunne ikke åpnes: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Nedlastingen er skadet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunne ikke åpnes: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Opplasting er ferdig</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Opplasting feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Ferdig å laste opp</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Innlogging feilet</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan ikke lese svar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Feil: %1</translation> </message> @@ -3445,33 +3454,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Last ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Velg nedlastingsmåte for Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Kobler til dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Feil</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Finn Uemis dykkecomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Avbryt nedlasting</translation> </message> @@ -3578,7 +3587,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Last ned</translation> </message> @@ -3604,7 +3613,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3619,52 +3628,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth er ikke skrudd på</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Leverandør:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Dykkecomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Forbindelse:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Prøv igjen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Avslutt</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Nedlastede dykk</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>OK</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Velg alle</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Velg ingen</translation> </message> @@ -3695,12 +3704,12 @@ p, li { white-space: pre-wrap; } <translation>Koble til Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Bruk "Del på"-menyen for å koble Subsurface fra Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logg inn for å koble til Facebook. Dette gjør at Subsurface kan poste dykk på veggen din</translation> </message> @@ -3708,22 +3717,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Logget inn på Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Feil, ukjent bruker-id, kan ikke logge inn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Lastet opp dykk til Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Kunne ikke laste opp dykk. Se debug-meldinger og send til epostlista til Subsurface</translation> </message> @@ -3974,7 +3983,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Dykkestedsdatabase</translation> </message> @@ -3996,7 +4005,7 @@ p, li { white-space: pre-wrap; } Er du sikker på at du vil fortsette?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Du redigerer et dykkested</translation> </message> @@ -4224,12 +4233,12 @@ Er du sikker på at du vil fortsette?</translation> <translation>Nytt dykkested</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Slette endringer?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du er i ferd med å droppe endringene dine.</translation> </message> @@ -4288,7 +4297,7 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Åpne</translation> </message> @@ -4584,13 +4593,13 @@ Er du sikker på at du vil fortsette?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Angre</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Gjør om</translation> </message> @@ -4630,58 +4639,63 @@ Er du sikker på at du vil fortsette?</translation> <translation>Skru skylagring på</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Koble til</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Koble fra</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Lagre eller avbryt redigeringa før du åpner en ny fil.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Åpne fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Gå gjennom bildekataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Går gjennom bilder... (dette kan ta en stund)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Advarsel</translation> </message> @@ -4691,105 +4705,105 @@ Er du sikker på at du vil fortsette?</translation> <translation>Prøver å slå sammen dykk med %1min intervall mellom</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Lagre eller avbryt redigeringen før du lukker fila.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Lagre eller avbryt redigeringa før du legger til et nytt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Skriv ut løpetidstabel</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Prøver å re-planlegge et dykk som ikke allerede er et planlagt dykk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Avslutt denne redigeringa før du starter en ny.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Prøver å redigere et dykk som ikke er lagt til manuelt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Årsstatistikk</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vil du lagre endringene i fila %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vil du lagre endrinene i datafila?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Lagre endringer?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Endringer vil gå tapt hvis du ikke lagrer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Lagre fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML-filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[lokal cache for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[skylager for] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Åpner datafil fra eldre versjon</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du åpnet en datafil fra en eldre versjon av Subsurface. Vi anbefaler at du leser manualen for å else om endringene i den nye versjonen, særlig med tanke på dykkestedsdatabasen. Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på dykkestedsdatabasen og sjekke at alt er greit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Åpne dykkelogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Loggfiler (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran-filer (*.can *.CAN);;CSV-filer (*.csv *.CSV);;DiveLog.de-filer (*.dld *.DLD);;JDiveLog-filer (*.jlb *.JLB);;Liquivision-filer (*.lvd *.LVD);;MkVI-filer (*.txt *.TXT);;Suunto-filer (*.sde *.db *.SDE *.DB);;Divesoft-filer (*.dlf *.DLF);;UDDF/UDCF-filer (*.uddf *.udcf *.UDDF *.UDCF);;XML-filer (*.xml *.XML);;APD log-filer (*.apd *.APD);;Datatrak/WLog-filer (*.log *.LOG);;OSTCtools-filer (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle filer (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Kontakter skylager...</translation> </message> @@ -4797,7 +4811,7 @@ Subsurface har allerede konvertert dataene, men det er sikkert lurt å kikke på <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Dra valgte dykkested</translation> </message> @@ -5115,32 +5129,12 @@ Hvis devicen din bruker bluetooth, gjør det samme som du gjør før en logg-ned </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Geo-oppslag av dykkested</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Skru på geo-koding for dykkestedsdatabase</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Les inn sted uten GPS-data</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Samme format for eksisterende dyk</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Dykkestedsoppsett</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5444,7 +5438,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Skylager for Subsurface</translation> </message> @@ -5525,6 +5519,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Skylager for Subsurface (bruker godkjent)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5795,28 +5799,28 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importer mal</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML-filer (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Eksporter mal som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Dette kan ikke gjøres om!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Slette mal: %1?</translation> </message> @@ -5824,12 +5828,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Ukjent computer</translation> </message> @@ -5839,108 +5843,108 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Funksjonen Vis NDL/TTS ble avskrudd siden den brukte for mye ressurser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Legg til gassbytte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Velg som første dykkecomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Planlagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Dykk lagt til manuelt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Slett denne computeren</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Legg til endring av setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Legg til bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Rediger profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Fjern hendelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Skjul lignende hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Rediger navn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Juster trykket i tank %1 (nå er den satt til %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Vis alle hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Skjul hendelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Skjul alle %1 hendelser?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Fjern den valgte hendelsen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Rediger navn på bokmerke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Tilpasset navn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Navnet er for langt</translation> </message> @@ -5948,147 +5952,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starter...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Kunne ikke åpne lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 dykk hentet fra lokal dykkelogg</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>jobber i ikke-sky-modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Klarte ikke å lese fra lokalt lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>ingen påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Legg in påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Epost og passord for skylager kan bare bestå av bokstaver, tall og '.', '-', '_', og '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Feil format på epostadresse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Prøver å åpne skylagring med nye påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Tester påloggingsdetaljer for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Skytjener svarte ikke ved validering av påloggingsdetaljer</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Feil bruker/passord for skyen</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Får ikke koblet til skylagring - konto er ikke verifisert</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Påloggingsdetaljer for skyen er ugyldige</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kunne ikke åpne skylagring: Feil ved opprettelse av https-forbindelse</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Kan ikke åpne skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Kan ikke koble til skylagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Gyldig bruker/passord, henter dykk</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Feil i skylagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Henter dykk fra lokalt lager ('ikke-sky-modus")</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Fikk ikke koblet til skylagring, skrur tilbake til lokal modus</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Tilkobling til skylagring OK. Ingen dykk i lista.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>t</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Ukjent GPS-posisjon</translation> </message> @@ -6246,6 +6250,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Feil formattert XML-svar. Linje %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Emner</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Liten</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dato: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>t</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Sted: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Dykkeleder: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Filer med upassende dykkedato/-tid</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>For å bruke Subsurface-mobile med skylagring, skriv brukernavn og passord.<br/><br/>Hvis dette er første gang du bruker skylagring med Subsurface, skriv inn epostadresse (bare små bokstaver) og passord (bare bokstaver og tall).<br/><br/>For å bruke Subsurface-mobile uten skylagring, velg "ingen skylagring" over.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Takk for at du registrerte deg hos Subsurface. Vi sendte <b>%1</b> en PIN-kode for å fullføre registreringen. Hvis du ikke mottar en epost fra oss innen 15 minutter, dobbelt sjekk at du har skrevet epostadressen rett, og sjekk søppelpostmappa di.<br/><br/>Hvis du fremdeles har problemer, kontakt oss på brukerforumet vårt (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7441,7 +7455,7 @@ fra luft og bruker: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klikk for å besøke %2</translation> </message> @@ -8396,8 +8410,8 @@ Snitt</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oksygen</translation> </message> @@ -8482,15 +8496,15 @@ Snitt</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>luft</translation> </message> @@ -8719,7 +8733,7 @@ Snitt</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>ukjent</translation> @@ -8979,7 +8993,7 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>Kunne ikke lese '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kan ikke åpne stilark %s</translation> </message> @@ -8995,21 +9009,21 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Advarsel:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Endring av SP</translation> @@ -9025,195 +9039,211 @@ Du kan lage denne ved å velge tilsvarende sjekkboks når i nedlastingsdialogen. <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Kjøretid:%dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>dybde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>lengde</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>løpetid</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gass</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Overgang til %.*f %s på %d:%02d min - løpetid %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Bli ved %.*f %s i %d:%02d min - løpetid %d:%02u i %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Bytt gass til %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Bytt til gass %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Dekomodell: VPM-B med nominell konservatisme</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>dykkeplan</b> (overflateintervall </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>dykkeplan</b> laget på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Kjøretid: %dmin VARIATIONS<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Bühlmann ZHL-16C med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Dekomodell: VPM-B med +%d konservervatisme</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Dekomodell: Rekreasjonsmodus basert på Bühlmann ZHL-16B med GF Low = %d%% og GF High = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM-trykk: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gassforbruk (CCR-etapper ekskludert):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gassforbruk (basert på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dette er mer gass en det som er tilgjengelig i tanken!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>ikke nok i reserve til å dele gass under oppstigning!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gass</span> (basert på %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>påkrevet minimum gass ved oppstigning overstiger flasketrykk</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s av <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s i planlagt oppstigning)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s under planlagt oppstigning) av <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>høy pO₂-verdi %.2f ve %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lav pO₂ verdi %.2f ved %d:%02u med gass %s ved dybde %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Finner ikke gassen %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9815,6 +9845,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dykkestatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Fridykk</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alle (ved turstatistikk)</translation> @@ -9850,97 +9905,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(ingen dykk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>søn</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>man</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>tir</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>lør</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>des</translation> </message> @@ -10171,6 +10226,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Lengde:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10276,7 +10332,7 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>Dybde</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>planlagt stopp over tak</translation> </message> @@ -10316,22 +10372,22 @@ Er Uemis Zurich plugget i ordentlig?</translation> <translation>By</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Lagrer data</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Lagrer dykk</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Opprettet lokal cache</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Forbereder lagring av data</translation> </message> diff --git a/translations/subsurface_nl_NL.ts b/translations/subsurface_nl_NL.ts index 35cab0e92..b6948f7f4 100644 --- a/translations/subsurface_nl_NL.ts +++ b/translations/subsurface_nl_NL.ts @@ -227,7 +227,7 @@ <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="353"/> <source>Trying to unpair device %1</source> - <translation>Probeer toestel %s te ontkoppelen</translation> + <translation>Probeer toestel %1 te ontkoppelen</translation> </message> <message> <location filename="../desktop-widgets/btdeviceselectiondialog.cpp" line="366"/> @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Klik hier om de fles te verwijderen.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Wissel diepte voor deco gas. Berekend mbv. Deco pO₂ voorkeur, tenzij manueel ingesteld.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Berekend mbv. Bodem pO₂ voorkeur. Instelling MOD bepaalt O₂%, zet op '*' voor beste O₂% voor maximum diepte.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Berekend mbv. Best Mix END voorkeur. Instelling MND bepaalt He%, zet op '*' voor beste He% voor maximum diepte.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Dit gas wordt gebruikt. Enkel flessen die niet gebruikt worden tijdens deze duik kunnen verwijderd worden.</translation> </message> @@ -2052,67 +2060,67 @@ GPS locatie:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Geen profiel te tonen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Duikpak:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Lucht Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Fles:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Water Temp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Toon kaart</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Beoordeling:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation>Zicht: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Gewicht:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>Gasverbruik:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notities</translation> </message> @@ -2120,23 +2128,23 @@ GPS locatie:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (fles %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Handmatig overschakelen naar OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> begin</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> eind</translation> @@ -2174,23 +2182,23 @@ GPS locatie:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Duiklijst</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Selecteer de '+' knop om een duik toe te voegen (of laad van een ondersteunde duikcomputer)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Geen duiken in de duiklijst</translation> </message> @@ -2198,102 +2206,102 @@ GPS locatie:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Alles uitklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Alles inklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Andere samenklappen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Duik(en) uit trip verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Nieuwe trip hierboven invoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Duik(en) toevoegen aan de trip hierboven</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Voeg duik(en) toe aan de trip hieronder</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Trip met bovenstaande samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Trip met onderstaande samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Duik(en) verwijderen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Markeer duik(en) als ongeldig</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Geselecteerde duiken samenvoegen</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Duik(en) opnieuw nummeren</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Tijdstip verschuiven</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Splits geselecteerde duiken</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Laad foto('s) van bestand(en)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Laad foto van het web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Afbeeldingen (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 lijkt geen foto bestand</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Afbeelding openen</translation> </message> @@ -2301,12 +2309,12 @@ GPS locatie:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Maak een nieuwe duikstek, door relevante informatie van de huidige duikstek te kopiëren. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Nieuwe duikstek aanmaken onder deze naam</translation> </message> @@ -2966,27 +2974,33 @@ GPS locatie:</translation> <translation>onbekend</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation>cyl.</translation> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Eind diepte</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Run time</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Duur</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gebruikt Gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ GPS locatie:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Diepte</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Tijd</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Druk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatuur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Kleur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Ingevoerd door gebruiker</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Fles index</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Druk S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Druk I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Plafond</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>Gasverbruik</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Omgevingsdruk</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Hartslag</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradiënt Factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Gemiddelde diepte @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>Fout bij schrijven zip bestand: %s zip fout %d systeem fout %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Klaar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Duiklijst wordt opgeladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Duiklijst wordt geladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>%1 duiken worden geladen...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Download klaar - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Download probleem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Het archief kon niet geopend worden: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Beschadigde download</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Het archief kon niet geopend worden: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload klaar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload mislukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Upload gelukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Login mislukt</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan antwoord niet correct ontleden</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Fout: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Downloaden</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Kies Bluetooth download mode</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation>Verbinden met duikcomputer</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Fout</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Uemis duikcomputer zoeken</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Onderbreek downloaden</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Downloaden</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Annuleren</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation>Bluetooth staat uit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Leveranciersnaam:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Duikcomputer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation>Verbinding:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Opnieuw</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Afsluiten</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Geladen duiken</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Informatie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Aanvaarden</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Alles selecteren</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Selectie ongedaan maken</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Aanmelden bij Facebook text placeholder</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Gebruik het 'Deel via' menu om de verbinding van Subsurface met uw Facebook account te sluiten.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Log in om verbinding met Facebook te maken. Dit maakt het mogelijk om duiken op uw tijdslijn te publiceren</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Facebook succesvol ingelogd</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Fout, onbekende user id, kan niet inloggen</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Duik succesvol naar Facebook gestuurd</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>Duik naar Facebook sturen mislukt. Zie debug uitvoer en stuur deze naar de Subsurface email lijst</translation> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Beheer duikstekken</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Bent u zeker?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>U bent een duikstek aan het bewerken</translation> </message> @@ -4226,12 +4235,12 @@ Bent u zeker?</translation> <translation>Nieuwe duikstek</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Wijzigingen niet opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>U staat op het punt wijzigingen te verwijderen</translation> </message> @@ -4290,7 +4299,7 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Open</translation> </message> @@ -4586,13 +4595,13 @@ Bent u zeker?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Ongedaan maken</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Opnieuw</translation> </message> @@ -4632,58 +4641,63 @@ Bent u zeker?</translation> <translation>Maak cloud storage online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Verbind met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Verbreek verbinding met</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor u een nieuw bestand opent.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Bestand openen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Annuleren</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation>Bewaar geen lege duiklog in de cloud</translation> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Doorloop mappen met afbeeldingen</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scan</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Scan afbeeldingen...(even geduld aub)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Waarschuwing</translation> </message> @@ -4693,105 +4707,105 @@ Bent u zeker?</translation> <translation>Je probeert duiken samen te voegen met een %1min oppervlakteinterval</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U het bestand sluit.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Bewaar of maak de huidige wijziging ongedaan voor U een duik toevoegt.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Runtime tabel afdrukken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>U probeert een duik te herplannen die geen geplande duik is.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Rond de huidige wijziging af vooraleer een volgende te beginnen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>U probeert een duik aan te passen die niet handmatig is toegevoegd.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Jaarlijkse statistieken</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Wilt u de wijzigingen in bestand %1 bewaren?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Wilt u de wijzigingen bewaren in het bestand?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Aanpassingen opslaan?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Wijzigingen gaan verloren als u deze niet bewaart.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Bestand bewaren als</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML bestanden (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[locale cache voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[cloud opslag voor] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Opent een databestand van een oudere versie</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>U heeft een databestand van een oudere versie van Subsurface geopend. Wij raden u aan de handleiding te lezen met betrekking tot de nieuwe versie, in het bijzonder de sterk veranderde duikstek-afhandeling. Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig zelf vast te stellen dat de conversie correct is verlopen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Open duiklogboek</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Duiklog bestanden (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Alle bestanden (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Contact opnemen met cloud service...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface heeft reeds gesprobeerd de data te converteren, maar het is nuttig ze <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Versleep de geselecteerde duiklocatie</translation> </message> @@ -5117,32 +5131,12 @@ Als je toestel Bluetooth gebruikt, doe de gelijke voorbereidingen als voor een l </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Duikstek geo locatie opzoeken</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Geocoding voor duikstek management aanzetten</translation> + <source>Dive site layout</source> + <translation>Duikplek layout</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Bewerk duikstek zonder GPS data</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Gelijke formaat voor bestaande duiken</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Duikstek layout</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface cloud opslag</translation> </message> @@ -5526,6 +5520,16 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface cloud opslag (rechten gecontroleerd)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <translation>Importeren</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importeer sjabloonbestand</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML bestanden (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Exporteer sjabloonbestand als</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Deze actie kan niet ongedaan gemaakt worden!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Verwijder sjabloon: %1?</translation> </message> @@ -5825,12 +5829,12 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 van %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Onbekende duikcomputer</translation> </message> @@ -5840,108 +5844,108 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <translation>NDL / TTS wordt niet getoond omdat de berekening te lang duurt</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Gaswissel toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Fles %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Maak eerste duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Geplande duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Handmatig toegevoegde duik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Verwijder deze duikcomputer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Voeg setpoint wissel toe</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Bladwijzer toevoegen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Profiel bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Gebeurtenis verwijderen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Gelijkaardige gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Naam bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Druk van fles %1 aanpassen (nu geschat op %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Toon alle gebeurtenissen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Gebeurtenissen verbergen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Alle %1 gebeurtenissen verbergen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Geselecteerde gebeurtenis verwijderen?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Naam bladwijzer bewerken</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Naam:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Deze naam is te lang!</translation> </message> @@ -5949,148 +5953,148 @@ Deze worden gebruikt "as-is". Dit is mogelijk niet wat u bedoeld. Zie <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Starten...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Open lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Open lokale duikgegevens mislukt</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 duiken geladen uit de lokale duikgegevens</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>werkt met lokale data</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>Fout bij het verwerken van de lokale opslag, opgegeven</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>Geen cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Voer geldige cloud rechten in</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Het cloud wachtwoord kan alleen letters, nummers en de volgende symbolen bevatten: '.', '-', '_', and '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation>Ongeldig formaat voor e-mailadres</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Probeert cloud opslag te openen met nieuwe rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Cloud rechten worden gecontroleerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Geen antwoord van de cloud server bij het valideren van de inlogrechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation>Onjuiste cloud rechten</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan niet verbinden met de Subsurface cloud opslag - cloud account niet geverifieerd</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Cloud rechten zijn ongeldig</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan cloud opslag niet openen: Fout bij aanmaken https verbinding</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Kan cloud opslag niet openen: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Kan niet verbinden met de Subsurface cloud opslag</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>Cloud rechten zijn geldig. duiken ophalen...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Cloud opslag fout: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>Duiken laden uit de lokale opslag ('no cloud' mode)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation> Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Cloud opslag succesvol geopend. Geen duiken in de duiklijst.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Onbekende GPS locatie</translation> </message> @@ -6248,6 +6252,16 @@ Kan niet verbinden met de Subsurface cloud opslag, terug naar lokale mode</trans <source>Malformed XML response. Line %1: %2</source> <translation>Slecht gevormd XML antwoord. Lijn %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation>Geen duikplek layout categorieën in voorkeuren!</translation> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Trefwoorden</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6662,64 +6676,64 @@ Bestanden met onjuiste datum/tijd</translation> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Klein</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Gemiddeld</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Datum duik: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duur: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Duiklocatie: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Buddy: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6812,12 +6826,12 @@ Bestanden met onjuiste datum/tijd</translation> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation>Voer je cloud rechten in om Subsurface-mobile met Subsurface cloud opslag te gebruiken.<br/><br/>Als dit de eerste keer is dat je de Subsurface cloud opslag gebruikt, voer een geldig email adres in (in kleine letters) en een wachtwoord naar keuze (letters en cijfers).<br/><br/>Klik de "no cloud" knop hierboven om Subsurface-mobile alleen met de lokale data op dit toestel te gebruiken.</translation> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation>Bedankt voor het registreren bij Subsurface. Wij hebben de PIN code aan <b>%1</b> gestuurd om de registratie te voltooien. Als je niet binnen 15 minuten de PIN code hebt ontvangen, controleer dan de juiste spelling van het email adres en de spam box als eerste. <br/><br/>In geval van verdere problemen bij het opzetten van een could account, neem dan contact met ons op op het forum (https://subsurface-divelog.org/user-forum/).<br/><br/></translation> </message> @@ -7442,7 +7456,7 @@ worden uit lucht en: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klik om te bezoeken %2</translation> </message> @@ -8398,8 +8412,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>zuurstof</translation> </message> @@ -8484,15 +8498,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) of (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>lucht</translation> </message> @@ -8721,7 +8735,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>onbekend</translation> @@ -8890,7 +8904,7 @@ Maximum</translation> <message> <location filename="../core/libdivecomputer.c" line="958"/> <source>model=%s firmware=%u serial=%u</source> - <translation>model=%u firmware=%u serienummer=%u</translation> + <translation>model=%s firmware=%u serienummer=%u</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="1020"/> @@ -8981,7 +8995,7 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>Fout bij analyse van '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kan de stylesheet %s niet openen</translation> </message> @@ -8997,21 +9011,21 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Waarschuwing:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effectieve GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP wijziging</translation> @@ -9027,195 +9041,211 @@ Dit log bestand kan worden aangemaakt door het selecteren van het juiste keuzeve <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation>duikplan</b> (Overlappende duiken vastgesteld)</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>diepte</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>duur</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Ga naar %.*f %s in %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Blijf op %.*f %s gedurende %d:%02d min - runtime %d:%02u op %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Gaswissel naar %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Gaswissel naar %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Deco model: VPM-B op nominaal conservatisme</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation>Minimum gas</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation>gebaseerd op</translation> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>Gasverbruik</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>duikplan</b> (oppervlakte interval </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>gemaakt op</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>duikplan</b> gemaakt op</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIATIES<br></div></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Bühlmann ZHL-16C met GFLow = %d%% en GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Deco model: VPM-B met +%d conservatisme</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Deco model: Recreatieve mode gebaseerd op Bühlmann ZHL-16B met GFLow = %d%% en GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Atmosferische druk: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasverbruik (uitgezonderd CCR segmenten):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gasverbruik (gebaseerd op SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>dit is meer gas dan beschikbaar in de geselecteerde duikfles!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>niet genoeg reserve om gas te delen gedurende opstijging!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (gebaseerd op %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></translation> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>vereist minimum gas voor de opstijging is al meer dan de begindruk van de cilinder!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in geplande opstijging)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s gedurende geplande opstijging) van <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>hoge pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lage pO₂ waarde %.2f op %d:%02u met gas %s op diepte %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Gas %s kan niet gevonden worden</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>EAN</translation> </message> @@ -9817,6 +9847,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Duikstatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Open Circuit</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Apneu</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alle (bij trip statistieken)</translation> @@ -9852,97 +9907,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(geen duiken)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Zo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Ma</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Di</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Wo</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Do</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Vr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Za</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>mei</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>sept</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>dec</translation> </message> @@ -10172,6 +10227,7 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Duur:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10277,7 +10333,7 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Diepte</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>gepland routepunt boven plafond</translation> </message> @@ -10317,22 +10373,22 @@ Is de Uemis Zurich correct aangesloten?</translation> <translation>Stad</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Opslaan data gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Opslaan duiken gestart</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Lokale cache aangemaakt</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>Voorbereiden data opslag</translation> </message> diff --git a/translations/subsurface_pl_PL.ts b/translations/subsurface_pl_PL.ts index 92c0bd509..a75f541a2 100644 --- a/translations/subsurface_pl_PL.ts +++ b/translations/subsurface_pl_PL.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1781,27 +1789,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknięcie tu usunie butlę z listy.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Ten gaz jest używany. Można usuwać tylko gazy, których nie używasz.</translation> </message> @@ -2047,67 +2055,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Skafander:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Temp. powietrza:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Temp. wody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Ocena:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Waga:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Partner:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Opis</translation> </message> @@ -2115,23 +2123,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Ręczna zmiana na OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> początek</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> koniec</translation> @@ -2169,23 +2177,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2193,102 +2201,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Rozwiń wszystkie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Zwiń wszystkie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Zwiń pozostałe</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Usuń nurkowanie(a) z grupy</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Utwórz nową grupę powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Dodaj nurkowanie(a) do grupy powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Dodaj nurkowanie(a) do grupy poniżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Połącz grupę z grupą powyżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Połącz grupę z grupą poniżej</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Usuń nurkowanie(a)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Oznacz nurkowanie(a) jak niepoprawne</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Połącz wybrane nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Zmień numerację</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Zmień czas nurkowania</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Podziel wybrane nurkowanie(a)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Dodaj zdjęcia z dysku</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Dodawanie zdjęć</translation> </message> @@ -2296,12 +2304,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Utwórz nowe miejsce nurkowe, skopiuj istotne informacje z bieżącego nurkowania.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Utwórz nowe miejsce nurkowe z tą nazwą</translation> </message> @@ -2961,27 +2969,33 @@ GPS location:</source> <translation>nieznana</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Głębokość końcowa</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Czas trwania</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Używany gaz</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3017,112 +3031,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Głębokość</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Czas</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Ciśnienie</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Kolor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Podane przez użytkownika</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Numer butli</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Ciśnienie S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Ciśnienie I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Sufit</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Czujnik 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Czujnik 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Czujnik 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Cisnienie otoczenia</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Tętno</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradient factor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Głębokość średnia @ s</translation> </message> @@ -3359,82 +3368,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Zakończ</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Wysyłanie listy nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Pobieranie listy nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Pobieranie %1 nurkowań...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Zakończono pobieranie - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem z pobieraniem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Nie udało się otworzyć archiwum: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Pobrano uskodzone dane</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Archiwum nie mogło zostać otworzone: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Wysyłanie zakończone</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Wysyłanie nieudane</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Wysyłanie zakończone sukcesem</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Błąd logowania</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Nie można przetworzyć odpowiedzi</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Błąd: %1</translation> </message> @@ -3442,33 +3451,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Pobierz</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Wybierz tryb pobierania Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Błąd</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Wykryj komputer Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3575,7 +3584,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Pobierz</translation> </message> @@ -3601,7 +3610,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Anuluj</translation> </message> @@ -3616,52 +3625,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Ponów</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Wyjście</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Zatwierdź</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Wybierz wszystko</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3692,12 +3701,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Zaloguj się, aby połączyć się z Facebookiem. Pozwoli to Subsurface publikować nurkowania na Twojej osi czasu.</translation> </message> @@ -3705,22 +3714,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3971,7 +3980,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Zarządzanie miejscami nurkowymi</translation> </message> @@ -3993,7 +4002,7 @@ p, li { white-space: pre-wrap; } Czy na pewno kontynuować?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Edytujesz miejsce nurkowania</translation> </message> @@ -4221,12 +4230,12 @@ Czy na pewno kontynuować?</translation> <translation>Nowe miejsce nurkowe</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Porzucić zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Masz zamiar porzucić zmiany.</translation> </message> @@ -4285,7 +4294,7 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Otwórz</translation> </message> @@ -4581,13 +4590,13 @@ Czy na pewno kontynuować?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Cofnij</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Ponów</translation> </message> @@ -4627,58 +4636,63 @@ Czy na pewno kontynuować?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Zapisz zmiany lub anuluj to nurkowanie przez otwarciem nowego pliku.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Otwórz plik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Anuluj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Katalogi zdjęć do przejrzenia</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Skanuj</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Skanowanie zdjeć... (to chwilę potrwa)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Ostrzeżenie</translation> </message> @@ -4688,105 +4702,105 @@ Czy na pewno kontynuować?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed zamknięciem pliku.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Zapisz zmiany lub anuluj edycję tego nurkowania przed dodaniem nowego.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Drukowanie planu nurkowego</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Próba zmiany planu nurkowania, które nie zostało utworzone przez planer.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Proszę dokończyć edycję tego nurkowania przed rozpoczęciem kolejnej. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Próba edycji nurkowania, które nie zostało dodane ręcznie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Statystyka roczna</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Czy chcesz zapisać zmiany dokonane w pliku %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Czy chcesz zapisać wprowadzone zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Zapisać zmiany?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmiany zostaną utracone jeśli ich nie za zapiszesz.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Zapisz plik jako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Pliki Subsurface XML (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[zapis w chmurze dla] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Otwarto plik ze starszej wersji</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Otworzony plik pochodzi ze starszej wersji Subsurface. Zalecamy zapoznać się z instrukcją i opisanymi tam zmianami w najnowszej wersji programu, szczególnie z nowym sposobem zarządzania miejscami nurkowymi. Subsurface zaimportował informacje o miejscach nurkowych, ale może warto poświęcić chwilę na przejrzenia tych danych i upewnienie się, że wszytko wygląda poprawnie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Otwórz plik z logiem</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Łączenie się z chmurą...</translation> </message> @@ -4794,7 +4808,7 @@ Subsurface zaimportował informacje o miejscach nurkowych, ale może warto pośw <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5109,32 +5123,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Układ miejsc nurkowych</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5436,7 +5430,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Pzechowywanie danych w chmurze</translation> </message> @@ -5517,6 +5511,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Przechowywanie danych w chmurze (uwierzytelniony)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5787,28 +5791,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Import</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importuj plik szablonu</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>Pliki HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Eksportuj szablon jako</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Tego nie da się cofnąć!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Usunąć szablon: %1?</translation> </message> @@ -5816,12 +5820,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Nieznany komputer nurkowy</translation> </message> @@ -5831,108 +5835,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Pokazywanie NDL / TTS zostało wyłączone z powodu zbyt długiego czasu obliczeń.</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Dodaj zmianę gazu</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Butla %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Dodaj notatkę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Edytuj profil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Usuń znacznik</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Ukryj podobne znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Zmień nazwę</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Zmień ciśnienie w butli %1 (obecnie interpolowane jako %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Odkryj wszystkie znaczniki</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ukrywanie wydarzeń</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Ukyć wszystkie wydarzenia typu %1?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Usunąć wybrane wydarzenie?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Zmień nazwę wydarzenia</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Własna nazwa:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Nazwa jest za długa!</translation> </message> @@ -5940,147 +5944,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Adres email i hasło do przechowywania danych w chmurze może zawierać jedynie litery, cyfry oraz znaki '.', '-', '_', '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6238,6 +6242,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Uszkodzona odpowiedź XML. Linia %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Tagi</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6652,64 +6666,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Średnia</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Czas: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Miejsce nurkowania: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Partner: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6802,12 +6816,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7433,7 +7447,7 @@ z powietrza przy użyciu: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8381,8 +8395,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>tlen</translation> </message> @@ -8467,15 +8481,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) lub (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>powietrze</translation> </message> @@ -8704,7 +8718,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>nieznana</translation> @@ -8962,7 +8976,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Nie udało się przetworzyć '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Nie można otworzyć arkusza stylów %s</translation> </message> @@ -8978,21 +8992,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Ostrzeżenie:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -9008,195 +9022,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>głębokość</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>czas trwania</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Przejście do %.*f %s w %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Pozostań na %.*f %s przez %d:%02d min - runtime %d:%02u z %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Zmiana gazu na %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Zmiana gazu na %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Zużycie gazu (nie uwzględnia CCR):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>to więcej gazu niż masz w dostępnych butlach!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>brak rezerwy na dzielenie się gazem z partnerem przy wynurzaniu!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>wysoki pO₂ o wartości %.2f w %d:%02u przy użyciu %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>niska wartość pO₂ %.2f o %d:%02u gaz %s na głębokości %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Nie można znaleźć gazu %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9790,6 +9820,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Status nurkowania</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9825,97 +9880,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(brak nurkowań)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Nie</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Pon</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Wto</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Śro</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Czw</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Pią</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sob</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Sty</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Lut</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Kwi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Cze</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Lip</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Sie</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Wrz</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Paź</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Lis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Gru</translation> </message> @@ -10145,6 +10200,7 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Długość:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10250,7 +10306,7 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Głębokość</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10290,22 +10346,22 @@ Czy Uemis Zurich jest podłączony poprawnie?</translation> <translation>Miasto</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_pt_BR.ts b/translations/subsurface_pt_BR.ts index 906cfb5c6..496a34561 100644 --- a/translations/subsurface_pt_BR.ts +++ b/translations/subsurface_pt_BR.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar este cilindro.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profundidade de troca do gás de deco. Calculada usando a preferência de pO₂ de deco, a não ser que tenha sido determinada manualmente.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Esse gás está em uso, Apenas cilindros que não estão sendo usados podem ser removidos.</translation> </message> @@ -2052,67 +2060,67 @@ Localização GPS:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Sem perfil para mostrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Roupa:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Temperatura do ar:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Cilindro:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Temperatura da água:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Classificação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Peso:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Companheiro:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notas</translation> </message> @@ -2120,23 +2128,23 @@ Localização GPS:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(cil. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Troca manual para OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>início</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>fim</translation> @@ -2174,23 +2182,23 @@ Localização GPS:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Credenciais para nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2198,102 +2206,102 @@ Localização GPS:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Esconder todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Esconder outros</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulhos de viagem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Criar viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulhos para a viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulhos para viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Juntar viagem com viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Juntar viagem com viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Apagar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marcar megulho(s) como inválidos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Juntar mergulhos selecionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Abrir imagens</translation> </message> @@ -2301,12 +2309,12 @@ Localização GPS:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2966,27 +2974,33 @@ Localização GPS:</translation> <translation>desconhecido</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Profundidade final</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Tempo</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Duração</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gás usado</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3022,112 +3036,107 @@ Localização GPS:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Profundidade</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Horário</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Pressão</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatura</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Cor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Entrado pelo usuário</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Indice do Cilindro</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Pressão S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Pressão I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Teto</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3360,81 +3369,81 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Finalizado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Enviando lista de mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Recebendo lista de mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Recebendo %1 mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Recebimento terminado - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Recebimento inválido</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>O arquivo não pode ser aberto: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Enviado finalizado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Envio falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Envio bem sucedido</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Abertura de sessão (login) falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Falha na análise da resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> @@ -3442,33 +3451,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Receber</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Erro</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Encontrar computador de mergulho Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3575,7 +3584,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Receber</translation> </message> @@ -3601,7 +3610,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Cancelar</translation> </message> @@ -3616,52 +3625,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Tentar novamente</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Encerrar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Selecionar tudo</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3692,12 +3701,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3705,22 +3714,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3971,7 +3980,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3992,7 +4001,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4220,12 +4229,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Descartar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Você está prestes a eliminar suas alterações.</translation> </message> @@ -4284,7 +4293,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4580,13 +4589,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4626,58 +4635,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho antes de abrir um novo arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Buscar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4687,104 +4701,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho antes de fechar o arquivo.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor, salve ou cancele a edição atual do mergulho atual antes de tentar adicionar um mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Imprimir tabela</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Primeiro termine a edição atual antes de editar outro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Estatisticas Anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Você quer salvar as alterações que fez no arquivo %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Você quer salvar as alterações feitas no arquivo?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Salvar Alteraḉões?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Salvar arquivo como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Arquivos XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Abrir arquivo</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4792,7 +4806,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5107,32 +5121,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5434,7 +5428,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5515,6 +5509,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5785,28 +5789,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>Arquivos HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5814,12 +5818,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 de %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5829,108 +5833,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Esconder todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Remover o evento selecionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Editar nome do favorito</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Apelido:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5938,147 +5942,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6236,6 +6240,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Resposta XML defeituosa. Linha %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Rótulos</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6648,59 +6662,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Médio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6792,12 +6806,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7422,7 +7436,7 @@ misturados com ar usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8372,8 +8386,8 @@ Médio</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8458,15 +8472,15 @@ Médio</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) ou (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>ar</translation> </message> @@ -8695,7 +8709,7 @@ Médio</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconhecido</translation> @@ -8952,7 +8966,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Falha na abertura da folha de estilo %s</translation> </message> @@ -8968,21 +8982,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Aviso:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8998,195 +9012,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>profundidade</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>duração</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>tempo</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gás</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Transição pra %.*f %s em %d:%02d min - tempo %d:%02u em %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Fique em %.*f %s por %d:%02d min - durante %d:%02u em %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Trocar o gás por %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>Isso é mais gás que a capacidade do cilindro especificado</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>Sem reserva para compartilhar ar na subida</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valor pO₂ alto %.2f em %d:%02u com gás %s na profundidade %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Não é possivel achar gas o %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9773,6 +9803,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9808,97 +9863,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10123,6 +10178,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Duração:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10228,7 +10284,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Profundidade</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10268,22 +10324,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_pt_PT.ts b/translations/subsurface_pt_PT.ts index 428d9b30e..095893efa 100644 --- a/translations/subsurface_pt_PT.ts +++ b/translations/subsurface_pt_PT.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="260"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Ao clicar aqui irá eliminar esta garrafa.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="272"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Profundidade para a troca de gás. Calculada usando as preferências para a PpO₂, excepto se especificado manualmente.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculado usando a preferência para a pO₂ para a fase de fundo. Seleccionar a MOD ajusta a O₂%; ajustar para '*' para obter a melhor O₂% para a profundidade máxima.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="278"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculado usando a preferência a END da melhor mistura. Seleccionar a MND ajusta a He%; ajustar para '*' para obter a melhor He% para a profundidade máxima.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="258"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Este gás está a ser usado. Apenas podem ser removidas as garrafas que não foram usadas durante o mergulho.</translation> </message> @@ -2174,23 +2182,23 @@ do GPS actual:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="288"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Lista de mergulhos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Credenciais da nuvem</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="284"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Por favor toque no botão '+' para adicionar um mergulho (ou para descarregar mergulhos de um computador de mergulho)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="309"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Não existem mergulhos na lista de mergulhos</translation> </message> @@ -2198,102 +2206,102 @@ do GPS actual:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandir todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Colapsar todos</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Colapsar outros</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Remover mergulho(s) desta viagem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Criar uma nova viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Adicionar mergulho(s) à viagem imediatamente acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Adicionar mergulho(s) à viagem imediatamente abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Juntar esta viagem com a viagem acima</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Juntar esta viagem com a viagem abaixo</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Eliminar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marcar mergulho(s) como inválido(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Juntar os mergulhos seleccionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumerar mergulho(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Deslocar os tempos de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Dividir os mergulhos seleccionados</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Carregar imagens do(s) ficheiro(s)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Carregar imagem da internet</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Imagens (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 não parece ser uma imagem</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Abrir ficheiros de imagens</translation> </message> @@ -3365,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>erro na escrita do ficheiro zip: %s erro zip %d erro de sistema %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Concluído</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>A carregar a lista dos mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>A transferir a lista dos mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>A transferir %1 mergulhos...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Transferência terminada - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problema ao descarregar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Não foi possível abrir o ficheiro: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Transferência corrompida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Não foi possível abrir o ficheiro: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Carregamento terminado</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>A exportação falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Exportação bem sucedida</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>O login falhou</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Não foi possível analisar a resposta</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Erro: %1</translation> </message> @@ -3657,17 +3665,17 @@ p, li { white-space: pre-wrap; } <translation>Informação:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="254"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Aceitar</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="271"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Seleccionar todos</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="279"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Desmarcar todos</translation> </message> @@ -3698,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Ligar ao campo de texto do Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="324"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Para desligar o Subsurface da sua conta do Facebook, use o menu 'Ligar partilha'.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="335"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Para ligar ao Facebook, por favor inicie a sessão (login). Isto permite ao Subsurface publicar os mergulhos na sua Cronologia (timeline)</translation> </message> @@ -3711,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="187"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation>Registo no Facebook com sucesso</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="190"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation>Erro, ID de utilizador desconhecida, não é possível entrar</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation>Mergulho carregado para o Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="290"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation>O carregamento do mergulho falhou. Por favor reveja a mensagem e envie-a para a mailing list do Subsurface</translation> </message> @@ -4291,7 +4299,7 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Abrir</translation> </message> @@ -4587,13 +4595,13 @@ Tem a certeza que quer continuar?</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Reverter</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Refazer</translation> </message> @@ -4633,63 +4641,63 @@ Tem a certeza que quer continuar?</translation> <translation>Colocar online o armazenamento remoto</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Ligar a</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Desligar de</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de abrir um novo ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Abrir Ficheiro</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="635"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Cancelar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="586"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> <source>Don't save an empty log to the cloud</source> <translation>Não gravar um ficheiro vazio remotamente</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Atravessar as pastas das imagens</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="634"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Procurar</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>A procurar imagens... (pode demorar um pouco)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="668"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Aviso</translation> </message> @@ -4699,100 +4707,100 @@ Tem a certeza que quer continuar?</translation> <translation>A tentar juntar mergulhos com %1min de intervalo entre eles</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="693"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de fechar o ficheiro.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="814"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Por favor grave ou cancele as edições feitas a este mergulho antes de adicionar outro mergulho.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="866"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Imprimir tabela de runtime</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="924"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Está a tentar planear novamente um mergulho que não foi criado no planeador de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1009"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1890"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Por favor, termine a edição em curso antes de iniciar outra.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1015"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>A tentar editar um mergulho que não foi criado manualmente.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1062"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Estatísticas anuais</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1285"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Deseja gravar as alterações feitas no ficheiro %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Deseja gravar as alterações feitas no ficheiro de dados?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1293"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Guardar alterações?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1294"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>As alterações serão perdidas se não forem gravadas.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1613"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Guardar ficheiro como</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1614"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Ficheiro XML do Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1711"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[cache local para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1713"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[armazenamento remoto para] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1829"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>A abrir ficheiro de uma versão mais antiga</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1830"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Abriu um ficheiro de uma versão antiga do Subsurface. Recomendamos que leia o manual para saber mais sobre as alterações para esta nova versão, especialmente no que respeita a gestão de locais de mergulho, que sofreu alterações importantes. O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sistema de gestão dos locais de mergulho para garantir que tudo está correcto.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1841"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Abrir ficheiro de registo de mergulhos</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1842"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Ficheiros de Dive log (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Ficheiros Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Ficheiros DiveLog.de (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Ficheiros Liquivision (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Ficheiros Suunto (*.sde *.db *.SDE *.DB);;Ficheiros Divesoft (*.dlf *.DLF);;Ficheiros UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Ficheiros Datatrak/WLog (*.log *.LOG);;Ficheiros OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Todos os ficheiros (*)</translation> </message> @@ -4805,7 +4813,7 @@ O Subsurface tentou preencher os dados, mas pode ser importante rever o novo sis <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="256"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation>Arraste o local de mergulho seleccionado</translation> </message> @@ -5123,32 +5131,12 @@ Se o seu computador de mergulho usa Bluetooth, prepare o update do mesmo modo qu </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Procura geográfica do local de mergulho</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Usar locais de mergulho codificados geograficamente</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Analisar local sem dados GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Usar o mesmo formato para os mergulhos existentes</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> <source>Dive site layout</source> <translation>Esquema de nomenclatura dos locais de mergulho</translation> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5452,7 +5440,7 @@ Veja mais informações em: http://doc.qt.io/qt-5/qdatetime.html#toString</trans </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Armazenamento remoto do Subsurface</translation> </message> @@ -5533,6 +5521,16 @@ Veja mais informações em: http://doc.qt.io/qt-5/qdatetime.html#toString</trans <source>Subsurface cloud storage (credentials verified)</source> <translation>Armazenamento remoto do Subsurface (credenciais verificadas)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5847,17 +5845,17 @@ Veja mais informações em: http://doc.qt.io/qt-5/qdatetime.html#toString</trans <translation>A visualização do NDL /TTS foi desactivada devido ao excessivo tempo de processamento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Adicionar mudança de gás</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation>(Garrafa %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Marca do computador de mergulho principal</translation> </message> @@ -5872,83 +5870,83 @@ Veja mais informações em: http://doc.qt.io/qt-5/qdatetime.html#toString</trans <translation>Mergulho adicionado manualmente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Apagar este computador de mergulho</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Adicionar mudança no setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Adicionar marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Editar o perfil</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Remover evento</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Esconder eventos semelhantes</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Editar nome</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajustar pressão da garrafa %1 (actualmente interpolada como %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Mostrar todos os eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ocultar eventos</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Ocultar todos os %1 eventos?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Remover o evento seleccionado?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Editar nome do marcador</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nome personalizado:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>O nome é demasiado comprido!</translation> </message> @@ -6678,64 +6676,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="364"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation>Pequeno</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="365"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Médio</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="385"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Data do mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Duração: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="389"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="390"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="393"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Local do mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Companheiro: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Guia de mergulho: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -7458,7 +7456,7 @@ obtidos a partir do ar usando: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1clicar para visitar %2</translation> </message> @@ -8737,7 +8735,7 @@ Média</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>desconhecido</translation> @@ -8997,7 +8995,7 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>Falha na análise de '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Não é possível abrir a folha de estilos %s</translation> </message> @@ -9048,6 +9046,11 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>plano de mergulho</b> (foram detectados mergulhos sobrepostos)</translation> </message> <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Runtime: %dmin<br></div></translation> @@ -9172,11 +9175,6 @@ Poderá criar este ficheiro seleccionando a opção respectiva no menu de downlo <translation>plano de mergulho</b> criado a</translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation>Runtime: %dmin VARIATIONS</translation> - </message> - <message> <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Modelo Deco: Bühlmann ZHL-16C com GFLow = %d%% e GFHigh = %d%%</translation> @@ -9849,6 +9847,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Estado do mergulho</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Circuito aberto</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Apneia</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Todos (estatísticas por viagem)</translation> @@ -9884,97 +9907,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nenhum mergulho)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Dom</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Seg</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Ter</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Qua</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Qui</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Sex</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sáb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Fev</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Abr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Ago</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Set</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Out</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dez</translation> </message> @@ -10350,22 +10373,22 @@ O Uemis Zurich está correctamente ligado?</translation> <translation>Cidade</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Iniciar registo dos dados</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Iniciar registo dos mergulhos</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>Armazenamento local criado com sucesso</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>A prerarar para gravar dados</translation> </message> diff --git a/translations/subsurface_ro_RO.ts b/translations/subsurface_ro_RO.ts index 6e6024d0f..b6c2f2f65 100644 --- a/translations/subsurface_ro_RO.ts +++ b/translations/subsurface_ro_RO.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Făcând click aici veți înlătura acest tub.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Adancime de schimbare gaz deco. Calculata folosind valoarea predefinita pO₂, daca nu a fost setata manual</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Calculat folosing Opțiunea pO₂ la Fund. Setând MOD se ajustează O₂%, setați '*' pentru O₂% optim la adancime maximă.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Calculat folosind Opțiunea Amestecul cel mai bun END. Setând MND ajustează He%, setați '*'pentru cel mai bun He% la adâncimea maximă.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Acestă butelie de gaz incă se folosește. Doar buteliile ce nu sunt folosite în scufundare pot fi șterse.</translation> </message> @@ -2052,67 +2060,67 @@ GPS curenta:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Nici un profil definit</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Costum:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Temperatura aer:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Butelie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Temperatura apei:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Marchează pe hartă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Rating:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Maestru scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Lest:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Însoțitor:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Notițe</translation> </message> @@ -2120,23 +2128,23 @@ GPS curenta:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (but. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Schimbare manuală la OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> început</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> sfârșit</translation> @@ -2174,23 +2182,23 @@ GPS curenta:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Lista scufundari</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Date de conectare la Cloud</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>Apasați butonul '+' pentru a adăuga o scufundare (sau pentru descărcarea scufundărilor din un computer suportat)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Nu exista nici o scufundare in lista</translation> </message> @@ -2198,102 +2206,102 @@ GPS curenta:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandare totală</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Colapsare separată</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Colapsare separată</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Elimină scufundare/scufundări din excursie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Adaugă o nouă excursie deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Adaugă scufundare/scufundări excursiei aflate deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Adaugă scufundare/scufundări excursiei aflate sub</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Unește excursia cu cea aflată deasupra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Unește excursia cu cea aflată sub</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Șterge scufundare/scufundări</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Marchează scufundarea/scufundările ca fiind invalidă/invalide</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Unește scufundările selectate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Renumerotează scufundarea/scufundările</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Schimbarea timpilor de scufundare</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Împărțirea scufundărilor selectate</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Încărcarea imaginilor din fișier</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Incarcati imagine din web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Fișier imagine (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 nu este o imagine</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Deschide fișierele imaginilor</translation> </message> @@ -2301,12 +2309,12 @@ GPS curenta:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Crearea unei noi locații de scufundare prin copierea informațiilor relevante din cea curentă.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Crearea unei noi locații de scufundare cu numele curent</translation> </message> @@ -2966,27 +2974,33 @@ GPS curenta:</translation> <translation>necunoscut</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Adâncime finală</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Timp de rulare</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Durată</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Gaz folosit</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>Valorare CC de refetință</translation> </message> @@ -3022,112 +3036,107 @@ GPS curenta:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Adâncime</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Timp</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Presiune</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatură</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Culoare</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Utilizatorul a intrat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Indexul tuburilor</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Presiune S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Presiunea I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Plafon</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Punct setat</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Senzor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Senzor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Senzor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Presiunea ambientală</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Puls</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Factorul gradient</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Adâncime medie @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>eroare la scrierea fișierului zip: %s eroare zip %d eroare sistem %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Finalizat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Se uploadează lista de scufundări...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Se descarcă lista de scufundări...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> - <translation>Se descarcă scufundările %s...</translation> + <translation>Se descarcă scufundările %1...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Descărcarea s-a terminat - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problema legată de descărcare</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arhiva nu a putut fi deschisă: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Descărcarea a fost coruptă.</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arhiva nu a putut fi deschisă: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Upload-ul a fost finalizat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Upload-ul a eșuat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Upload-ul a avut succes</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Logarea a eșuat</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Nu s-a putut parsa răspunsul</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Eroare: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Descarcă</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Descărcarea datelor folosind Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Eroare</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Găsește calculatorul de scufundări Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Anulare descărcare</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Descarcă</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Anulează</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Nume producător:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Computer scufundare:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Reîncearcă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Ieșire</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Scufundari descarcate:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Informație:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Acceptă</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Selectează totul</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Deselecteaza tot</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Conectați-vă la locul text din Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Pentru a deconecta Subsurface de la contul Facebook, folosiți 'Partajați ca' din meniu.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Pentru a vă conecta la Facebook, va rugăm să vă autentificați. Acesta va permite aplicației Subsurface să publice scufundările pe timeline-ul dumneavoastă</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Administrarea locației pentru scufundare</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Sigur doriți să continuați?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Sunteți in modul de editare a locației de scufundare</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>Locație de scufundare nouă</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Renunțați la modificări?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Sunteți pe cale să renunțați la modificări.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Deschide</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Anulează</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Refă</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Obține stocare cloud online</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Conectați-vă la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Deconectați-vă de la</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a deschide un nou fișier.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Deschideți fișier</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Anulează</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Imagine direcții traverse</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Scanare</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Scanare imagini ... (poate dura mai mult timp)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Avertizare</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation>Incercare de unire scufundări cu interval de %1min între</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a închide fișierul.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Vă rugăm salvați sau anulați editarea scufundării curente înainte de a încerca să adăugați o scufundare.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Printați tabelul de execuție</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Încercare de replanificare scufundare ce nu este o scufundare planificată</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Vă rugăm să terminați editarea curentă înainte de a începe una nouă.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Încercare de modificare a unei scufundări ce nu a fost adăugată manual.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Statistici anuale</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Doriți să salvați modificările efectuare în fișierul %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Doriți să salvați modificările efectuare în fișierul de date?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Doriți să salvați modificările?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Modificările vor fi pierdute dacă nu le salvați.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Salvează ca</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Fișiere XML Subsurface (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[cache local pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[intregistrare din cloud pentru] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Deschidere fisier de date din o versiune mai veche</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>A-ți deschis un fisier cu date din o versiune mai veche a Subsurface. Recomandăm citirea manualului pentru a afla despre schimbările din noua versiune, în special despre administrarea locurilor de scufundare, modul a suferit modificări majore. Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificați noul sistem de administrare a locurilor de scufundare și să vă asigurați că totul a decurs fără erori.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Deschideți înregistrările scufundărilor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Fișiere scufundare (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Fișiere Cochran (*.can *.CAN);;CSV files (*.csv *.CSV);;Fișiere DiveLog.de (*.dld *.DLD);;Fișiere JDiveLog (*.jlb *.JLB);;Fișiere Liquivision (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Fișiere Suunto (*.sde *.db *.SDE *.DB);;Fișiere Divesoft (*.dlf *.DLF);;Fișiere UDDF/UDCF(*.uddf *.udcf *.UDDF *.UDCF);;Fișiere XML (*.xml *.XML);;Fișiere APD (*.apd *.APD);;Fișiere Datatrak/WLog (*.log *.LOG);;Fișiere OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Se contactează serviciul cloud</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface a încercat deja să pre-populeze datele dar ar trebui să verificaț <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ Dacă dispozitivul dvs. folosește Bluetooth, faceți aceleași pregatiri ca și </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Căutare locație geografică a scufundării</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Activează geocodarea pentru administrarea locurilor de scufundare</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Afișează locația fără detalii GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Același format pentru scufundările existente</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Profilul locului de scufundare</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Stocare cloud subsurface</translation> </message> @@ -5526,6 +5520,16 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Credențialele Subsurface cloud (credențiale verificate)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Importă</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importă fișier șablon</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>Fișiere HTML (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Exportă fișierele șablon ca</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Acestă acțiune nu poate fi anulată!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Șterge șablonul: %1?</translation> </message> @@ -5825,12 +5829,12 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation>(#%1 din %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Calculator de scufundări necunoscut</translation> </message> @@ -5840,108 +5844,108 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Arată NDL / TTS a fost dezactivat din cauza timpului excesiv de procesare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Adaugă gazul modificat</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Rezervor %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Definește ca primul computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Scufundare planificată</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Scufundare adăugată manual</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Șterge acest computer</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Adaugă schimbare de setpoint</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Adaugă marcaj</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Modifică profilul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Șterge evenimentul</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Ascunde evenimente similare</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Modifică numele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Ajustează presiunea rezervorului %1 (în momentul de față aceasta este interpolată ca %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Arată toate evenimentele</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Ascunde evenimente</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Ascunde toate %1 evenimentele?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Înlătură evenimentul selectat?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Modifică numele marcajului</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Nume presonalizat:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Numele este prea lung</translation> </message> @@ -5949,147 +5953,147 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Se incarcă...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>Deschide fișier local cu scufundări</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>Eroare deschidere fișier cu scufundări local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 scufundări încărcate din fișier local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>operare în mod local</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>E-mailul și parola de cloud pot conține doar litere, numere și '.', '-', '_', și '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Locatie GPS necunoscuta</translation> </message> @@ -6247,6 +6251,16 @@ A se vedea http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Răspuns XML incorect. Linia %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Etichete</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6659,64 +6673,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Mediu</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Timpul scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Durata: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Locația scufundării: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Însoțitor: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Maestru scufundări: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6809,12 +6823,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7438,7 +7452,7 @@ mixate cu aer și folosite:</translation> <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8391,8 +8405,8 @@ Medie</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oxigen</translation> </message> @@ -8477,15 +8491,15 @@ Medie</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) sau (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>aer</translation> </message> @@ -8714,7 +8728,7 @@ Medie</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>necunoscut</translation> @@ -8970,7 +8984,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Nu s-a putut parsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Nu s-a putut deschide stylesheet-ul %s</translation> </message> @@ -8986,21 +9000,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Avertizare:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>Schimbare SP</translation> @@ -9016,195 +9030,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>adâncime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>durată</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>timp de rulare</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gaz</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Tranziția la %.*f %s în %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Tranziția la %.*f %s în %d:%02d min - timp de rulare %d:%02u în %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stai la %.*f %s pentru %d:%02d min - timp de rulare %d:%02u în %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Schimbă gazul la %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Schimbă gazul la %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gaz consumat (picioarele CCR au fost excluse):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>este necesar de mai mult gaz decât de cel disponibil in tub!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>nu există rezerve de gaz ce pot fi împărțite la urcare!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valoare pO₂ mare %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>valoare pO₂ mică %.2f la %d:%02u cu gazul %s la adâncimea %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Gazul %s nu a fost găsit</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9794,6 +9824,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Starea scufundării</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Scufundare libera</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9829,97 +9884,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(nicio scufundare)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Duminică</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Luni</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Marți</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Miercuri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Joi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Vineri</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Sâmbătă</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Mai</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Iun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Iul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Oct</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Noi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10147,6 +10202,7 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Durată:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10252,7 +10308,7 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation>Adâncime</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10292,22 +10348,22 @@ Este conectat corect dispozitivul Uemis Zurich?</translation> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_ru_RU.ts b/translations/subsurface_ru_RU.ts index dd8b02a39..57dd031a9 100644 --- a/translations/subsurface_ru_RU.ts +++ b/translations/subsurface_ru_RU.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>л</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Нажмите здесь чтобы удалить этот баллон.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Глубина переключения на деко-газ. Рассчитывается из настроек деко pO₂, если не указано вручную.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>Вычислено с учетом настройки донного pO₂. Ввод MOD меняет O₂%, установите '*' для лучшего O₂% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>Вычислено с учетом настройки END лучшей смеси. Ввод MND меняет He%, установите '*' для лучшего He% на макс. глубине.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Этот газ используется. Можно удалять только те баллоны, которые не используются.</translation> </message> @@ -2052,67 +2060,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Нет профиля для отображения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Костюм:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Темп. воздуха:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Баллон:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Темп. воды:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Рейтинг:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Инструктор:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Вес:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Напарник:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Примечания</translation> </message> @@ -2120,23 +2128,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (баллон %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Ручной переход на ОЦ</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation> начало</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation> конец</translation> @@ -2174,23 +2182,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Список погружений</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Учетные данные в облаке</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Нет погружений в списке</translation> </message> @@ -2198,102 +2206,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Развернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Свернуть все</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Свернуть остальные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Удалить из поездки</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Создать поездку выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Добавить к поездке сверху</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Добавить к поездке снизу</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Объединить с поездкой выше</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Объединить с поездкой ниже</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Удалить</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Пометить как ошибочное(-ые)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Объединить выбранные</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Перенумеровать</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Сдвиг времени</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Разбить выделенные погружения</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Загрузить фото из файлов</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Загрузить фото из Web</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 не является картинкой</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Открыть файлы изображений</translation> </message> @@ -2301,12 +2309,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Создать новый дайв-сайт, заполнив данными из текущего погружения.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Создать дайв-сайт с этим наванием</translation> </message> @@ -2966,27 +2974,33 @@ GPS location:</source> <translation>неизвестно</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Отсчет</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Длительность</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Исп. газ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>Установка ребризера</translation> </message> @@ -3022,112 +3036,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Глубина</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Время</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Температура</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Цвет</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Пользователь</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Индекс баллона</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Давление S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Давление I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Потолок</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Установка</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Сенсор 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Сенсор 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Сенсор 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Внешнее давление</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Пульс</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Градиент-фактор</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Средняя глубина @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>ошибка сохранения zip-файла: %s ошибка %d системная ошибка %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Готово</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Выгрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Загрузка списка погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Загрузка %1 погружений...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Загрузка завершена - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Ошибка загрузки</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Невозможно открыть архив: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Поврежденная загрузка</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Невозможно открыть архив: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Выгрузка не удалась</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Выгрузка завершена</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Ошибка входа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Ошибка разбора ответа</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Ошибка: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Загрузить</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Выберите режим загрузки по Bluetooth</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Ошибка</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Найти дайвкомпьютер Uemis</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Отменить загрузку</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Загрузить</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Отмена</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Производитель : </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Дайв-компьютер:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Повторить</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Выход</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Загруженные погружения</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Принять</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Выбрать все</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Отменить выделение</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Соединение с Facebook</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>Чтобы отключиться от Facebook, используйте пункт меню "Поделиться".</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Авторизуйтесь чтобы подключиться к Facebook. После этого Subsurface сможет публиковать погружения в хронике.</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Управление дайв-сайтами</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Вы желаете продолжить?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Редактирование дайв-сайта</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>Новый дайв-сайт</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Отменить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Вы собираетесь отменить свои изменения.</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Открыть</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>Отменить</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>Повторить</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Подключить облачное хранилище</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Подключиться к</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Отключиться от</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Сохраните или отмените изменения перед открытием нового файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Открыть журнал</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Отмена</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Сканировать директории с фото</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Сканировать</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Поиск изображений, подождите...</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Предупреждение</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Сохраните или отмените изменения перед закрытием файла.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Сохраните или отмените изменения перед добавлением погружения.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Печать плана погружения</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Попытка перепланирования погружения, созданного не в планировщике.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Пожалуйста, для начала закончите текущее редактирование, а потом пробуйте редактировать другой.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Попытка редактирования погружения, созданного не вручную.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Статистика по годам</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Хотите ли вы сохранить изменения, внесенные в файл журнала?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Сохранить изменения?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Изменения будут утеряны, если вы не сохраните их.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Сохранить как</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML файлы (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[локальный кэш для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[облачное хранилище для] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Журнал создан в старой версии</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Вы открыли журнал, созданный в старой версии Subsurface. Мы рекомендуем прочитать руководство, чтобы узнать о последних изменения, особенно что касается управления сайтами погружений. Subsurface попытался перенести уже существующие данные, но тем не менее стоит проверить, что все информация выглядит корректно.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Открыть журнал погружений</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Файлы погружений (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Файлы Cochran (*.can *.CAN);;Файлы CSV (*.csv *.CSV);;Файлы DiveLog.de (*.dld *.DLD);;Файлы JDiveLog (*.jlb *.JLB);;Файлы Liquivision (*.lvd *.LVD);;Файлы MkVI (*.txt *.TXT);;Файлы Suunto (*.sde *.db *.SDE *.DB);;Файлы Divesoft (*.dlf *.DLF);;Файлы UDDF/UDCF (*.uddf *.udcf *.UDDF *.UDCF);;Файлы XML (*.xml *.XML);;APD log viewer (*.apd *.APD);;Файлы Datatrak/WLog (*.log *.LOG);;Файлы OSTCtools (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;Все файлы (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Соединение с облачным сервисом...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface попытался перенести уже существующие <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Геопоиск дайв-сайтов</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Включить геокодирование для дайв-сайтов</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Искать сайты без координат GPS</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Один формат для существующих погружений</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Формат названия дайв-сайта</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Облачное хранилище Subsurface</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Облачное хранилище Subsurface (данные подтверждены)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Импорт</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Импорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML файлы (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Экспорт шаблона печати</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Это действие не может быть отменено!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Удалить шаблон: %1?</translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 из %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Неизвестный дайвкомпьютер</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>Отображение NDL/TTS отключено из-за большого времени расчета</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Добавить замену газа</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Баллон %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Сделать первым дайв-компьютером</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Удалить этот дайв-компьютер</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Добавить изменение сетпойнта</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Добавить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Редактировать профиль</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Удалить событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Скрыть похожие события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Скорректировать давление баллона %1 (текущее интерполированное %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Показать все события</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Скрыть событие</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Спрятать все %1 события?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Удалить выбранное событие?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Изменить закладку</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Название:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Слишком длинное название!</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Запуск...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>работа без облачного хранилища</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>нет учетных данных для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Укажите правильные учетные данные для облака</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Адрес почты и пароль для могут содержать только буквы, цифры и '.', '-', '_', и '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Попытка открыть облачное хранилище с новыми учетными данными</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Проверка учетных данных</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Нет ответа от сервера в облаке чтобы проверить учетные данные</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Невозможно подключиться к облачному хранилищу - учетная запись не проверена</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Учетные данные неверны</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Невозможно открыть облачное хранилище: Ошибка защищенного подключения</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Невозможно открыть облачное хранилище: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Невозможно подключиться к облачному хранилищу</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Ошибка облачного хранилища: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Ошибка подключения к серверу в облаке, работа в обычном режиме</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Облачное хранилище открыто. Погружения отсутствуют.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>ч</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>мин</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>с</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Неизвестное местоположение GPS</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Неверный XML ответ. Строка %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Метки</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Средняя</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Дата погружения: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Длительность: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>ч</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>мин</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Местоположение: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Партнер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Дайвмастер: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7441,7 +7455,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1нажмите чтобы перейти к %2</translation> </message> @@ -8395,8 +8409,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>кислород</translation> </message> @@ -8481,15 +8495,15 @@ Maximum</source> <translation>кг</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) или (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>воздух</translation> </message> @@ -8718,7 +8732,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>неизвестно</translation> @@ -8976,7 +8990,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Ошибка разбора '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Невозможно открыть файл преобразования %s</translation> </message> @@ -8992,21 +9006,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Внимание:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, эффективный GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>изменение SP</translation> @@ -9022,195 +9036,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Бюльман</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Рантайм: %dмин<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>глубина</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>длительность</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>отсчет</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>смесь</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Переход на %.*f %s за %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Остановка на %.*f %s в течение %d:%02d мин - отсчет %d:%02u на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Остановка на %.*f %s на %d:%02d мин - отсчет %d:%02u на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dмин</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Переключение на %s (SP = %.1fбар)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Переключение на %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Деко-модель: VPM-B с номинальным консерватизимом</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>план погружения</b> (поверх. интервал </translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>план погружения</b> создан</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Bühlmann ZHL-16C с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Деко-модель: VPM-B с консерватизимом +%d</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>Деко-модель: Рекреационный режим по модели Bühlmann ZHL-16B с GFlow = %d%% и GFhigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>Атм. давление: %dмбар (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Потребление газа (без CCR сегментов)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Расход газа (расчет по SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>расход выше чем запас газа в указанном баллоне!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>недостаточно газа для резерва при подъеме</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>мин. запас газа для подъема уже превышает начальное давление в баллоне</translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s из <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s в запланированном подъеме)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s в запланированном подъеме) из <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>высокий pO₂ %.2f в %d:%02u на %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>Низкое значение pO₂ %.2f в %d:%02u на смеси %s на глубине %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Невозможно найти газ %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9807,6 +9837,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Статистика погружения</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>Откр. цикл</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>Фридайв</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Все (статистика по поездкам)</translation> @@ -9842,97 +9897,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(нет погружений)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Вск</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Пнд</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Втр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>Срд</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Чтв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Птн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>Суб</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Янв</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Фев</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Мар</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Апр</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Май</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Июн</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Июл</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Авг</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Снт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Окт</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Ноя</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Дек</translation> </message> @@ -10162,6 +10217,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Длительность:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>мин</translation> @@ -10267,7 +10323,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Глубина</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>путевая точка выше потолка</translation> </message> @@ -10307,22 +10363,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Город</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_sk_SK.ts b/translations/subsurface_sk_SK.ts index e77aa3415..82f2362f6 100644 --- a/translations/subsurface_sk_SK.ts +++ b/translations/subsurface_sk_SK.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1781,27 +1789,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Kliknutím sem vymažeš fľašu</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Táto zmes sa používa. Len fľaše, ktoré nie sú použité pri ponore, môžu byť vymazané.</translation> </message> @@ -2047,67 +2055,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Oblek:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Teplota vzduchu:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Teplota vody:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Hodnotenie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Závažie:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Buddy:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Poznámky</translation> </message> @@ -2115,23 +2123,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>začiatok</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>koniec</translation> @@ -2169,23 +2177,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2193,102 +2201,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandovať všetky</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Zredukovať všetky</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Zbaliť ostatné</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Vymazať ponor(y) z akcie</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Vytvoriť novú akciu nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Pridať ponor(y) do akcie hneď nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Pridať ponor(y) do akcie hneď pod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Spoj akciu s akciou nad</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Spoj akciu s akciou pod</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Zmazať ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Neplatný ponor(y)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Spojiť vybraté ponory</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Prečíslovanie ponorov</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Otvoriť súbory s obrázkami</translation> </message> @@ -2296,12 +2304,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2961,27 +2969,33 @@ GPS location:</source> <translation>neznámy</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Cieľová hĺbka</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Aktuálny čas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Dĺžka (min)</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Použitá zmes</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3017,112 +3031,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Čas</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Teplota</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Farba</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Index fliaš</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Tlak S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Tlak I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Strop</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>Spotreba plynu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Okolitý tlak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3355,82 +3364,82 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Hotovo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Nahrávanie zoznamu ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Sťahovanie zoznamu ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Sťahovanie %1 ponorov...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Sťahovanie ukončené %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Nemôžem otvoriť archív: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Poškodené sťahovanie</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Nemôžem otvoriť archív: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Nahrávanie ukončené</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Nahrávanie zlýhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Úspešne nahrávanie</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Prihlásenie zlýhalo</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Neviem spracovať odpoveď</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Chyba: %1</translation> </message> @@ -3438,33 +3447,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Stiahnutie</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Chyba</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Hladať Uemis DC</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3571,7 +3580,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Stiahnutie</translation> </message> @@ -3597,7 +3606,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> @@ -3612,52 +3621,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Skús znovu</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Koniec</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Akceptovať</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Vybrať všetky</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3688,12 +3697,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3701,22 +3710,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3967,7 +3976,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3988,7 +3997,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4216,12 +4225,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Vymazať zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Chystáš sa vymazať zmeny.</translation> </message> @@ -4280,7 +4289,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Otvor</translation> </message> @@ -4576,13 +4585,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4622,58 +4631,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred otvorením nového súboru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Otvoriť súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Zrušiť</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Upozornenie</translation> </message> @@ -4683,104 +4697,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred zatvorením súboru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Ulož alebo zruš aktuálne editovanie ponoru pred pridaním nového ponoru.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Vytlačiť runtime tabuľku</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Ukonči aktuálne editovanie pred tým než začneš ďalšie.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Ročná štatistika</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Chceš uložiť zmeny prevedené v súbore %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Chces uložiť zmeny prevedené v dátovom súbore?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Uložiť zmeny?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Zmeny budu stratené ak ich neuložíš.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Uložiť súbor ako</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML súbory (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Otvoriť log súbor</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4788,7 +4802,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5103,32 +5117,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5430,7 +5424,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5511,6 +5505,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5781,28 +5785,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML súbory (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5810,12 +5814,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 z %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5825,108 +5829,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Pridaj zmenu zmesi</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Fľaša %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Pridať Bookmark</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Vymazať udalosť</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Schovaj podobné udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Editovať meno</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Zobraziť všetky udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Schovaj udalosti</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Schovať všetky %1 udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Zmazať vybrané udalosti?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Editovať meno záložky</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Voliteľné meno:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Príliš dlhý názov!</translation> </message> @@ -5934,147 +5938,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6232,6 +6236,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>Nekorektná XML odpoveď. Riadok %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Značky</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6644,59 +6658,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Stredný</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6788,12 +6802,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7418,7 +7432,7 @@ vytvorene zo vzduchu a: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8365,8 +8379,8 @@ Maximum</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>kyslík</translation> </message> @@ -8451,15 +8465,15 @@ Maximum</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) alebo (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>vzduch</translation> </message> @@ -8688,7 +8702,7 @@ Maximum</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>neznámy</translation> @@ -8944,7 +8958,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Chyba pri spracovaní '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Neviem otvoriť šablónu %s</translation> </message> @@ -8960,21 +8974,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Upozornenie:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8990,201 +9004,217 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>hĺbka</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>trvanie</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>runtime</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>plyn</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar) </translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Prechod na %.*f %s v %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s (SP = %.1fbar) </translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Zostaň v %.*f %s na %d:%02d min - runtime %d:%02u na %s </translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Zmena plynu na %s (SP = %.1fbar) </translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Zmena plynu na %s </translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>Spotreba plynu</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>toto je väčšie množstvo plynu než je k dispozícií v danej fľaši!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>žiadna rezerva pre zdieľanie zmesi počas výstupu!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>vysoká pO₂ hodnota %.2f v %d:%02u so zmesou %s v hĺbke %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Neviem nájsť zmes %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9773,6 +9803,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Stav ponoru</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9808,97 +9863,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(žiadné ponory)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>Ne</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>Po</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>Ut</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>St</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>Št</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>Pi</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>So</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Máj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Dec</translation> </message> @@ -10123,6 +10178,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Trvanie:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10228,7 +10284,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Hĺbka</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10268,22 +10324,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_sv_SE.ts b/translations/subsurface_sv_SE.ts index bb741d53d..ac7743008 100644 --- a/translations/subsurface_sv_SE.ts +++ b/translations/subsurface_sv_SE.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Klicka här för att ta bort denna flaska</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>Bytes djup för deko gas. Beräknad med deko pO₂ inställning, om inte satt manuellt.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Denna gas används. Bara flaskor som inte används kan tas bort.</translation> </message> @@ -2052,67 +2060,67 @@ GPS position:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>Ingen profil finns att visa</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>Dräkt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>Lufttemp:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>Flaska:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>Vattentemperatur:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>Märk på karta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>Ranking:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>Divemaster:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Vikt:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>Parkamrat:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>SAC:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Anteckningar</translation> </message> @@ -2120,23 +2128,23 @@ GPS position:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation>(cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>Manuellt byte till OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>start</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>slut</translation> @@ -2174,23 +2182,23 @@ GPS position:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>Dyklista</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>Moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>Inga dyk i dyklistan</translation> </message> @@ -2198,102 +2206,102 @@ GPS position:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Expandera alla</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Sammanslå alla</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Fäll samman andra</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Ta bort dyk från resa</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Ny resa ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Lägg till dyk(en) till resan ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Lägg till dyk(en) till resan nedanför</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Sammanfoga resa med resan ovan</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Sammanfoga resa med resan under</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Radera dyk(en)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Markera dyk som ogiltiga</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Slå samman valda dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Uppdatera numrering</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>Korrigera dyk tider</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>Dela markerade dyk</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>Laddar bild(er) från fil(er)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>Ladda bild från nätet</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>Bild filer (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 verkar inte vara en bild</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Öppna bildfler</translation> </message> @@ -2301,12 +2309,12 @@ GPS position:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>Skapa en ny dykplats, kopiera relevant information från detta dyk.</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>Skapa en ny dykplats med detta namn</translation> </message> @@ -2966,27 +2974,33 @@ GPS position:</translation> <translation>okänd</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>Slutdjup</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>Löptid</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Varaktighet</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>Använd gas</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC setpoint</translation> </message> @@ -3022,112 +3036,107 @@ GPS position:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Djup</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Tid</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Tryck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Temperatur</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>Färg</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>Användarinmatad</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>Flaskid</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>Tryck S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>Tryck I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>Tak</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>Omgivande tryck</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>Hjärtrytm</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>Gradientfaktor</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>Medeldjup @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>fel vid skrivning av zip fil: %s zip fel %d system fel %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>Klar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>Laddar upp dyklista...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>Laddar ner dyklista...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>Laddar ner %1 dyk...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>Nedladdning klar - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>Problem med nerladdningen</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>Arkiver kunde inte öppnas: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>Misslyckad nedladdning</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>Arkivet kunde inte öppnas: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>Uppladdning klar</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>Uppladdning misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>Uppladdningen lyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>Inloggning misslyckades</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>Kan inte tolka respons</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>Fel: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>Ladda ned</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>Välj Blåtands nerladdnings läge</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Error</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>Hitta Uemis dykdator</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>Avbryt nerladdning</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>Ladda ned</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>Avbryt</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>Tillverkar namn:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>Dykdator:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Försök igen</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Avsluta</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>Nerladdade dyk:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>Info:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Acceptera</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>Markera Samtliga</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>Avmarkera alla</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>Anslut till Facebook </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>För att koppla ner Subsurface från ditt Facebook-konto, använd 'Dela på' menyn.</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>Logga in för att koppla Subsurface till Facebook. Det tillgängliggör möjligheten att publicera dyk till din Facebook-timeline.</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>Dykplats administration</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } Är du säker att du vill fortsätta?</translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>Du redigerar en dykplats</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>Ny dykplats</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>Kassera ändringarna?</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>Du är påväg att kasta bort dina förändringar</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>Öppna</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>&Ångra</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>&Gör om</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>Gör molnlagring aktiv</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>Anslut till</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>Kopplan ner från</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker öppna en ny fil.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>Öppna fil</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>Avbryt</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>Traversera bild kataloger</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>Sök</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>Scannar bilder...(detta kan ta ett tag)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>Varning</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du stänger filen.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>Vänligen spara eller avbryt pågående ändring av dyk innan du försöker lägga till ett dyk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>Skriv ut körtidstabell</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>Försöker planera om ett dyk som inte är en dykplan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>Först avsluta den aktuella ändringen innan du försöker göra en annan.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>Försöker ändra ett dyk som inte är ett manuellt inlagt dyk.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>Årsstatistik</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>Vill du spara ändringarna som du gjort i filen %1?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>Vill du spara ändringarna som du gjort i filen?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>Spara ändringar?</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>Ändringar förloras om du inte sparar dom.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>Spara fil som</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML filer (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[lokal cache för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[molnlatgring för] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>Öppnar datafil från en äldre version</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>Du öppnade en datafil från en äldre version av Subsurface. Vi rekommenderar att du läser manualen för att lära dig om förändringarna i den nya versionen, speciellt om dykplats administrationen som har ändrats signifikant. Subsurface har redan försökt att fylla i datat men det kan vara värt besväret att titta på den nya dykplats administrationen och se till att allt ser bra ut.</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>Öppna dyklogg</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>Dyklogg filer (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>Kontaktar molntjänst...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface har redan försökt att fylla i datat men det kan vara värt besväre <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ On din enhet använder blåtand, gör samma förberedelser som för loggboks ner </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>Dykplats geouppslag</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>Aktivera geokodning för dykplats administration</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>Tolka plats utan GPS data</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>Samma format för befintliga dyk</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>Dykplats layouten</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface molnlagring</translation> </message> @@ -5526,6 +5520,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface molnlagring (verifierade referenser)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Importera</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>Importera mallfil</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTMLfiler (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>Exportera mallfil som</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>Denna åtgärd kan inte ångras!</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>Radera mall: %1?</translation> </message> @@ -5825,12 +5829,12 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 av %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>Okänd dykdator</translation> </message> @@ -5840,108 +5844,108 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <translation>Visa NDL / TTS stängdes av pga att det tog för lång tid att beräkna</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>Lägg till gasbyte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Flaska %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>Gör till första dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>Planera dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>Manuellt tillagt dyk</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>Ta bort denna dykdator</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>Lägg till setpoint byte</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>Lägg till bokmärke</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>Editera profilen</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>Ta bort händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>Göm liknande händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>Ändra namn</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>Förändra trycket i flaska %1 (nu beräknat till %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>Visa alla händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>Göm händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>Göm alla %1händelser</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>Ta bort markerad händelse</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>Ändra namnet på bokmärket</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>Valt namn:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>Namnet är för långt!</translation> </message> @@ -5949,147 +5953,147 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>Startar...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>Arbetar i molnfritt läge</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>inga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>Vänligen ange giltiga moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>Molnlagrings email och lösenord kan bara beså av bokstäver, siffror samt '.', '-', '_' och '+'.</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>Försöker öppna moln lagring med nya referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>Testar moln referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>Inget svar från molnservern för verifiering av referenser</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>Kan inte ansluta till moln lagring - molnkonto inte verifierat</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>Moln referenser är ogiltiga</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>Kan inte öppna moln lagring: Gick inte skapa https koppling</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>Kan inte öppna molnlagring: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>Kan inte ansluta till moln lagring</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>Molnlagrings fel: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>Misslyckades ansluta till moln server, återgår till molnfri status</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>Molnlagring öppnades framgångsrikt. Inga dyk i dyklistan</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>Min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sek</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>Okänd GPS position</translation> </message> @@ -6247,6 +6251,16 @@ Se http://doc.qt.io/qt-5/qdatetime.html#toString</translation> <source>Malformed XML response. Line %1: %2</source> <translation>Felformaterat XML svar. Rad %1: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>Taggar</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6661,64 +6675,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>Medium</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>Dykdatum: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>Varaktighet: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>Min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>Dykplats: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>Parkamrat: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>Divemaster: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6811,12 +6825,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7441,7 +7455,7 @@ mixas av luft och: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>%1klicka för att besöka %2</translation> </message> @@ -8391,8 +8405,8 @@ Medel</translation> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>oxygen</translation> </message> @@ -8477,15 +8491,15 @@ Medel</translation> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) eller (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>luft</translation> </message> @@ -8714,7 +8728,7 @@ Medel</translation> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>okänd</translation> @@ -8972,7 +8986,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Kunde inte läsa '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>Kunde inte öppna formatmall %s</translation> </message> @@ -8988,21 +9002,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>Varning:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effektiv GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP ändring</translation> @@ -9018,195 +9032,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation>Löptid: %dmin<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>djup</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>varaktighet</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>körtid</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>gas</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>Förflytta till %.*f %s på %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>Stanna på %.*f %s i %d:%02d min - körtid %d:%02u på %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>Stanna vid %.*f %s för %d:%02d min - körtid %d:%02u på %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>Byt gas till %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>Byt gas till %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>Deko modell: VPM-B med nominal konservatism</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>dykplan</b> (ytintervall</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>skapad på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>dykplan</b> skapad på</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>Deko modell: VPM-B med +%d konservatism</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM tryck: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>Gasförbrukning (CCR-delar exkluderade):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>Gasförbrukning (baserad på SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>det här är mer gas än vad som finns tillgängligt i angiven cylinder!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>inte nog med reserver för att kunna dela gas under uppstigningen!</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>högt pO₂ %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>lågt pO₂ värde %.2f vid %d:%02u med gas %s på djup %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>Kan inte hitta gas %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9801,6 +9831,31 @@ EADD: %d%s / %.1fg/ℓ <translation>Dykstatus</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>fridykning</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>Alla (baserat på resestatus)</translation> @@ -9836,97 +9891,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(inga dyk)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>sön</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>mån</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>tis</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>ons</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>tor</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>fre</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>lör</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>jan</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>feb</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>mar</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>maj</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>jun</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>jul</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>aug</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>sep</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>okt</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>nov</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>dec</translation> </message> @@ -10156,6 +10211,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Varaktighet:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>Min</translation> @@ -10261,7 +10317,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Djup</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>planerat mål ovanför tak</translation> </message> @@ -10301,22 +10357,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Storstad</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>Börja spara data</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>Börja spara dyk</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_vi.ts b/translations/subsurface_vi.ts index 2fc699299..4715aa536 100644 --- a/translations/subsurface_vi.ts +++ b/translations/subsurface_vi.ts @@ -374,6 +374,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1779,27 +1787,27 @@ <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>Click vào đây sẽ loại bỏ này xi lanh.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>Khí này hiện đang được sử dụng. Chỉ các xi lanh không được sử dụng khi lặn có thể được gỡ bỏ.</translation> </message> @@ -2045,67 +2053,67 @@ GPS location:</source> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>Cân nặng:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>Ghi chú</translation> </message> @@ -2113,23 +2121,23 @@ GPS location:</source> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>bắt đầu</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>kết thúc</translation> @@ -2167,23 +2175,23 @@ GPS location:</source> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation type="unfinished"/> </message> @@ -2191,102 +2199,102 @@ GPS location:</source> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>Mở rộng tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>Mở ra tất cả</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>Loại bỏ (các)máy lặn từ chuyến đi</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>Tạo một chuyến đi mới phía trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở trên</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>Thêm (các)chuyến đi lặn ngay lập tức ở dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>Gập chuyến đi với chuyến đi trước</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>Gộp chuyến đi với chuyến đi bên dưới</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>Xóa (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>Đánh dấu (các)lần lặn không hợp lệ</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>Hợp nhất các lần lặn được chọn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>Đánh dấu lại (các)lần lặn</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>Mở tập tin hình ảnh</translation> </message> @@ -2294,12 +2302,12 @@ GPS location:</source> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation type="unfinished"/> </message> @@ -2959,27 +2967,33 @@ GPS location:</source> <translation>chưa rõ</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>Độ dài</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation type="unfinished"/> </message> @@ -3015,112 +3029,107 @@ GPS location:</source> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>Thời gian</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>Áp suất</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>Nhiệt độ</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>SAC</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation type="unfinished"/> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation type="unfinished"/> </message> @@ -3353,80 +3362,80 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation type="unfinished"/> </message> @@ -3434,33 +3443,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>Lỗi</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation type="unfinished"/> </message> @@ -3567,7 +3576,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation type="unfinished"/> </message> @@ -3593,7 +3602,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation type="unfinished"/> </message> @@ -3608,52 +3617,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>Thử lại</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>Thoát</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>Chấp nhậ</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation type="unfinished"/> </message> @@ -3684,12 +3693,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation type="unfinished"/> </message> @@ -3697,22 +3706,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3963,7 +3972,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation type="unfinished"/> </message> @@ -3984,7 +3993,7 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation type="unfinished"/> </message> @@ -4212,12 +4221,12 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation type="unfinished"/> </message> @@ -4276,7 +4285,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation type="unfinished"/> </message> @@ -4572,13 +4581,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation type="unfinished"/> </message> @@ -4618,58 +4627,63 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation type="unfinished"/> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation type="unfinished"/> </message> @@ -4679,104 +4693,104 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation type="unfinished"/> </message> @@ -4784,7 +4798,7 @@ Subsurface has already tried to pre-populate the data but it might be worth whil <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5099,32 +5113,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> + <source>Dive site layout</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation type="unfinished"/> </message> @@ -5426,7 +5420,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation type="unfinished"/> </message> @@ -5507,6 +5501,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation type="unfinished"/> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5777,28 +5781,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML files (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation type="unfinished"/> </message> @@ -5806,12 +5810,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation type="unfinished"/> </message> @@ -5821,108 +5825,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation type="unfinished"/> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation type="unfinished"/> </message> @@ -5930,147 +5934,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation type="unfinished"/> </message> @@ -6228,6 +6232,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation type="unfinished"/> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation type="unfinished"/> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6640,59 +6654,59 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>nhỏ nhất</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation type="unfinished"/> @@ -6784,12 +6798,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7412,7 +7426,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation type="unfinished"/> </message> @@ -8351,8 +8365,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation type="unfinished"/> </message> @@ -8437,15 +8451,15 @@ Maximum</source> <translation>ký</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) hoặc (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>không khí</translation> </message> @@ -8674,7 +8688,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>chưa rõ</translation> @@ -8930,7 +8944,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>Thất bại khi chuyển thông số '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation type="unfinished"/> </message> @@ -8946,21 +8960,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation type="unfinished"/> @@ -8976,195 +8990,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> - <source>Runtime: %dmin<br></div></source> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="114"/> - <source>depth</source> + <source>Runtime: %dmin %s</source> <translation type="unfinished"/> </message> <message> <location filename="../core/plannernotes.c" line="117"/> + <source>Runtime: %dmin<br></div></source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="123"/> + <source>depth</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>SAC</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9731,6 +9761,31 @@ EADD: %d%s / %.1fg/ℓ <translation type="unfinished"/> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation type="unfinished"/> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation type="unfinished"/> @@ -9766,97 +9821,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(không có cuộc lặn nào)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>CN</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>T2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>T3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>T4</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>T5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>T6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>T7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>Th1</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>Th2</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>Th3</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>Apr</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>Th5</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>Th6</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>Th7</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>Th8</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>Th9</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>Th10</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>Th11</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>Th12</translation> </message> @@ -10081,6 +10136,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>nhỏ nhất</translation> @@ -10186,7 +10242,7 @@ Is the Uemis Zurich plugged in correctly?</source> <translation>Độ sâu</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation type="unfinished"/> </message> @@ -10226,22 +10282,22 @@ Is the Uemis Zurich plugged in correctly?</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation type="unfinished"/> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation type="unfinished"/> </message> diff --git a/translations/subsurface_zh_TW.ts b/translations/subsurface_zh_TW.ts index f3596e52b..d4a0c8280 100644 --- a/translations/subsurface_zh_TW.ts +++ b/translations/subsurface_zh_TW.ts @@ -378,6 +378,14 @@ </message> </context> <context> + <name>CloudStorageAuthenticate</name> + <message> + <location filename="../core/cloudstorage.cpp" line="65"/> + <source>Cloud account verification required, enter PIN in preferences</source> + <translation type="unfinished"/> + </message> +</context> +<context> <name>ColumnNameProvider</name> <message> <location filename="../desktop-widgets/divelogimportdialog.cpp" line="46"/> @@ -1785,27 +1793,27 @@ <translation>ℓ</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="275"/> + <location filename="../qt-models/cylindermodel.cpp" line="259"/> <source>Clicking here will remove this cylinder.</source> <translation>於此處按下將移除此氣瓶.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="287"/> + <location filename="../qt-models/cylindermodel.cpp" line="271"/> <source>Switch depth for deco gas. Calculated using Deco pO₂ preference, unless set manually.</source> <translation>減壓氣體交換深度. 除非手動計算, 請優先使用減壓 pO₂ 計算. </translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="290"/> + <location filename="../qt-models/cylindermodel.cpp" line="274"/> <source>Calculated using Bottom pO₂ preference. Setting MOD adjusts O₂%, set to '*' for best O₂% for max. depth.</source> <translation>計算優先使用置底 pO₂. 設定 MOD 自動調整 O₂% , 根據最大深度取得 '*' 最佳 O₂%. </translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="293"/> + <location filename="../qt-models/cylindermodel.cpp" line="277"/> <source>Calculated using Best Mix END preference. Setting MND adjusts He%, set to '*' for best He% for max. depth.</source> <translation>計算最佳 Mix END優先. 設定 MHD 自動調整 He%, 根據最大深度取得 '*' 最佳 He%.</translation> </message> <message> - <location filename="../qt-models/cylindermodel.cpp" line="273"/> + <location filename="../qt-models/cylindermodel.cpp" line="257"/> <source>This gas is in use. Only cylinders that are not used in the dive can be removed.</source> <translation>此氣瓶仍在使用中，在潛水中，只有未使用的氣瓶可被移除。</translation> </message> @@ -2052,67 +2060,67 @@ GPS位置:</translation> <context> <name>DiveDetailsView</name> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="222"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> <source>No profile to show</source> <translation>無資料顯示</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="228"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> <source>Suit:</source> <translation>防寒衣：</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="234"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> <source>Air Temp:</source> <translation>氣溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="278"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="284"/> <source>Cylinder:</source> <translation>氣瓶:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="240"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="246"/> <source>Water Temp:</source> <translation>水溫:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="62"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="63"/> <source>Map it</source> <translation>標記</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="107"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="112"/> <source>Rating:</source> <translation>評分:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="149"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="155"/> <source>Visibility:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="331"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="337"/> <source>Divemaster:</source> <translation>潛導：</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="285"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="291"/> <source>Weight:</source> <translation>重量:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="338"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="344"/> <source>Buddy:</source> <translation>潛伴:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="292"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="298"/> <source>SAC:</source> <translation>耗氣率: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="374"/> + <location filename="../mobile-widgets/qml/DiveDetailsView.qml" line="380"/> <source>Notes</source> <translation>記錄</translation> </message> @@ -2120,23 +2128,23 @@ GPS位置:</translation> <context> <name>DiveEventItem</name> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="156"/> + <location filename="../profile-widget/diveeventitem.cpp" line="158"/> <source> (cyl. %1)</source> <translation> (cyl. %1)</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="170"/> + <location filename="../profile-widget/diveeventitem.cpp" line="172"/> <source>Manual switch to OC</source> <translation>手動切換至 OC</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="172"/> + <location filename="../profile-widget/diveeventitem.cpp" line="174"/> <source> begin</source> <comment>Starts with space!</comment> <translation>開始</translation> </message> <message> - <location filename="../profile-widget/diveeventitem.cpp" line="173"/> + <location filename="../profile-widget/diveeventitem.cpp" line="175"/> <source> end</source> <comment>Starts with space!</comment> <translation>結束</translation> @@ -2174,23 +2182,23 @@ GPS位置:</translation> <name>DiveList</name> <message> <location filename="../mobile-widgets/qml/DiveList.qml" line="13"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="280"/> - <location filename="../mobile-widgets/qml/DiveList.qml" line="286"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="281"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="287"/> <source>Dive list</source> <translation>潛水列表</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="276"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="277"/> <source>Cloud credentials</source> <translation>雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="282"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="283"/> <source>Please tap the '+' button to add a dive (or download dives from a supported dive computer)</source> <translation>請按下 '+' 鍵新增潛水 (或從支持的潛水電腦下載潛水記錄)</translation> </message> <message> - <location filename="../mobile-widgets/qml/DiveList.qml" line="307"/> + <location filename="../mobile-widgets/qml/DiveList.qml" line="308"/> <source>No dives in dive list</source> <translation>列表中無任何潛水記錄</translation> </message> @@ -2198,102 +2206,102 @@ GPS位置:</translation> <context> <name>DiveListView</name> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="847"/> + <location filename="../desktop-widgets/divelistview.cpp" line="856"/> <source>Expand all</source> <translation>全部展開</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="849"/> + <location filename="../desktop-widgets/divelistview.cpp" line="858"/> <source>Collapse all</source> <translation>全部摺疊</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="853"/> + <location filename="../desktop-widgets/divelistview.cpp" line="862"/> <source>Collapse others</source> <translation>摺疊其它</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="857"/> + <location filename="../desktop-widgets/divelistview.cpp" line="866"/> <source>Remove dive(s) from trip</source> <translation>從旅程中移除潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="858"/> + <location filename="../desktop-widgets/divelistview.cpp" line="867"/> <source>Create new trip above</source> <translation>設定為新的旅程</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="872"/> + <location filename="../desktop-widgets/divelistview.cpp" line="881"/> <source>Add dive(s) to trip immediately above</source> <translation>於上方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="874"/> + <location filename="../desktop-widgets/divelistview.cpp" line="883"/> <source>Add dive(s) to trip immediately below</source> <translation>於下方增加潛水記錄(多支)至旅程中</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="878"/> + <location filename="../desktop-widgets/divelistview.cpp" line="887"/> <source>Merge trip with trip above</source> <translation>與上方旅程合併</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="879"/> + <location filename="../desktop-widgets/divelistview.cpp" line="888"/> <source>Merge trip with trip below</source> <translation>與下方旅程合併</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="883"/> + <location filename="../desktop-widgets/divelistview.cpp" line="892"/> <source>Delete dive(s)</source> <translation>刪除潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="885"/> + <location filename="../desktop-widgets/divelistview.cpp" line="894"/> <source>Mark dive(s) invalid</source> <translation>標示為無效的潛水記錄(多支)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="889"/> + <location filename="../desktop-widgets/divelistview.cpp" line="898"/> <source>Merge selected dives</source> <translation>合併所選擇的潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="891"/> + <location filename="../desktop-widgets/divelistview.cpp" line="900"/> <source>Renumber dive(s)</source> <translation>為潛水記錄(多支)重新編號</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="892"/> + <location filename="../desktop-widgets/divelistview.cpp" line="901"/> <source>Shift dive times</source> <translation>移動潛水時間</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="893"/> + <location filename="../desktop-widgets/divelistview.cpp" line="902"/> <source>Split selected dives</source> <translation>分開所選擇的潛水</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="894"/> + <location filename="../desktop-widgets/divelistview.cpp" line="903"/> <source>Load image(s) from file(s)</source> <translation>從多檔案載入圖片</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="895"/> + <location filename="../desktop-widgets/divelistview.cpp" line="904"/> <source>Load image from web</source> <translation>從網頁載入影像</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="921"/> + <location filename="../desktop-widgets/divelistview.cpp" line="930"/> <source>Image files (%1)</source> <translation>影像檔案 (%1)</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="977"/> + <location filename="../desktop-widgets/divelistview.cpp" line="986"/> <source>%1 does not appear to be an image</source> <translation>%1 非影像檔案</translation> </message> <message> - <location filename="../desktop-widgets/divelistview.cpp" line="919"/> + <location filename="../desktop-widgets/divelistview.cpp" line="928"/> <source>Open image files</source> <translation>開啟影像檔</translation> </message> @@ -2301,12 +2309,12 @@ GPS位置:</translation> <context> <name>DiveLocationModel</name> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="370"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> <source>Create a new dive site, copying relevant information from the current dive.</source> <translation>建立新的潛點, 從潛水紀錄複製相關資訊. </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="371"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="372"/> <source>Create a new dive site with this name</source> <translation>以此名稱建立新的潛點</translation> </message> @@ -2966,27 +2974,33 @@ GPS位置:</translation> <translation>未知</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="346"/> + <location filename="../qt-models/diveplannermodel.cpp" line="190"/> + <location filename="../qt-models/diveplannermodel.cpp" line="275"/> + <source>cyl.</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../qt-models/diveplannermodel.cpp" line="371"/> <source>Final depth</source> <translation>最後深度</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="348"/> + <location filename="../qt-models/diveplannermodel.cpp" line="373"/> <source>Run time</source> <translation>持續時間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="350"/> + <location filename="../qt-models/diveplannermodel.cpp" line="375"/> <source>Duration</source> <translation>區間</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="352"/> + <location filename="../qt-models/diveplannermodel.cpp" line="377"/> <source>Used gas</source> <translation>使用氣量</translation> </message> <message> - <location filename="../qt-models/diveplannermodel.cpp" line="354"/> + <location filename="../qt-models/diveplannermodel.cpp" line="379"/> <source>CC setpoint</source> <translation>CC 設定點</translation> </message> @@ -3022,112 +3036,107 @@ GPS位置:</translation> <context> <name>DivePlotDataModel</name> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="113"/> <source>Depth</source> <translation>深度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="115"/> <source>Time</source> <translation>時間</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="117"/> <source>Pressure</source> <translation>壓力</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="119"/> <source>Temperature</source> <translation>溫度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="121"/> <source>Color</source> <translation>顔色</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="123"/> <source>User entered</source> <translation>使用者輸入</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> - <source>Cylinder index</source> - <translation>氣瓶編號</translation> - </message> - <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="125"/> <source>Pressure S</source> <translation>壓力S</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="127"/> <source>Pressure I</source> <translation>壓力I</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="129"/> <source>Ceiling</source> <translation>上限深度</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="131"/> <source>SAC</source> <translation>耗氣率</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="133"/> <source>pN₂</source> <translation>pN₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="135"/> <source>pHe</source> <translation>pHe</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="137"/> <source>pO₂</source> <translation>pO₂</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="139"/> <source>Setpoint</source> <translation>Setpoint</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="141"/> <source>Sensor 1</source> <translation>Sensor 1</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="143"/> <source>Sensor 2</source> <translation>Sensor 2</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="145"/> <source>Sensor 3</source> <translation>Sensor 3</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="147"/> <source>Ambient pressure</source> <translation>環境壓力</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="149"/> <source>Heart rate</source> <translation>心率</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="155"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="151"/> <source>Gradient factor</source> <translation>梯度因子</translation> </message> <message> - <location filename="../qt-models/diveplotdatamodel.cpp" line="157"/> + <location filename="../qt-models/diveplotdatamodel.cpp" line="153"/> <source>Mean depth @ s</source> <translation>平均深度 @ s</translation> </message> @@ -3364,82 +3373,82 @@ p, li { white-space: pre-wrap; } <translation>寫入 ZIP 檔案: %s 發生錯誤 %d 系統錯誤 %d - %s</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="758"/> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="757"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="948"/> <source>Done</source> <translation>完成</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="792"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="791"/> <source>Uploading dive list...</source> <translation>上傳潛水列表...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="824"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="823"/> <source>Downloading dive list...</source> <translation>下載潛水列表...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="865"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="864"/> <source>Downloading %1 dives...</source> <translation>下載 %1 潛水...</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="899"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="898"/> <source>Download finished - %1</source> <translation>下載結束 - %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="912"/> <source>Problem with download</source> <translation>下載發生錯誤</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="914"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="913"/> <source>The archive could not be opened: </source> <translation>存檔無法被開啟: </translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="922"/> <source>Corrupted download</source> <translation>中斷下載</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="924"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="923"/> <source>The archive could not be opened: %1</source> <translation>此存檔無法被開啟: %1</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="950"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="949"/> <source>Upload finished</source> <translation>上傳結束</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="963"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="962"/> <source>Upload failed</source> <translation>上傳失敗</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="966"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="965"/> <source>Upload successful</source> <translation>上傳成功</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="969"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="968"/> <source>Login failed</source> <translation>登入失敗</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="972"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="971"/> <source>Cannot parse response</source> <translation>回覆無法解析</translation> </message> <message> - <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="984"/> + <location filename="../desktop-widgets/subsurfacewebservices.cpp" line="983"/> <source>Error: %1</source> <translation>錯誤: %1</translation> </message> @@ -3447,33 +3456,33 @@ p, li { white-space: pre-wrap; } <context> <name>DownloadFromDCWidget</name> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="88"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="95"/> <source>Download</source> <translation>下載</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="91"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="98"/> <source>Choose Bluetooth download mode</source> <translation>選擇藍芽下載模式</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="121"/> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="124"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="128"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="131"/> <source>Connecting to dive computer</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="216"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="223"/> <source>Error</source> <translation>錯誤</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="268"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="275"/> <source>Find Uemis dive computer</source> <translation>搜索Uemis潛水設備</translation> </message> <message> - <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="293"/> + <location filename="../desktop-widgets/downloadfromdivecomputer.cpp" line="300"/> <source>Cancel download</source> <translation>取消下載</translation> </message> @@ -3580,7 +3589,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="179"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="179"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> <source>Download</source> <translation>下載</translation> </message> @@ -3606,7 +3615,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/downloadfromdivecomputer.ui" line="298"/> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Cancel</source> <translation>取消</translation> </message> @@ -3621,52 +3630,52 @@ p, li { white-space: pre-wrap; } <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="63"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="68"/> <source> Vendor name: </source> <translation>廠商名稱: </translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="94"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="99"/> <source> Dive Computer:</source> <translation>潛水電腦:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="129"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="134"/> <source> Connection:</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="181"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="194"/> <source>Retry</source> <translation>重試</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="192"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="205"/> <source>Quit</source> <translation>結束</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="202"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="215"/> <source> Downloaded dives</source> <translation>下載潛水</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="203"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="216"/> <source>Info:</source> <translation>資訊:</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="236"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="256"/> <source>Accept</source> <translation>同意</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="253"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="273"/> <source>Select All</source> <translation>選擇全部</translation> </message> <message> - <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="261"/> + <location filename="../mobile-widgets/qml/DownloadFromDiveComputer.qml" line="281"/> <source>Unselect All</source> <translation>取消選取</translation> </message> @@ -3697,12 +3706,12 @@ p, li { white-space: pre-wrap; } <translation>連結至Facebook張貼</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="322"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="330"/> <source>To disconnect Subsurface from your Facebook account, use the 'Share on' menu entry.</source> <translation>從Facebook帳號中斷Subsurface連接, 改以使用選單"分享"進入. </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="333"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="341"/> <source>To connect to Facebook, please log in. This enables Subsurface to publish dives to your timeline</source> <translation>請先登入連結 Facebook 帳號。來啟動 Subsurface 發布潛水記錄至您的時間表</translation> </message> @@ -3710,22 +3719,22 @@ p, li { white-space: pre-wrap; } <context> <name>FacebookManager</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="185"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="193"/> <source>Facebook logged in successfully</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="188"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="196"/> <source>Error, unknown user id, cannot login.</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="286"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="294"/> <source>Dive uploaded successfully to Facebook</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="288"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="296"/> <source>Dive upload failed. Please see debug output and send to Subsurface mailing list</source> <translation type="unfinished"/> </message> @@ -3976,7 +3985,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/locationinformation.cpp" line="32"/> - <location filename="../desktop-widgets/locationinformation.cpp" line="250"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="251"/> <source>Dive site management</source> <translation>潛點管理</translation> </message> @@ -3998,7 +4007,7 @@ p, li { white-space: pre-wrap; } 請注意是否要繼續? </translation> </message> <message> - <location filename="../desktop-widgets/locationinformation.cpp" line="257"/> + <location filename="../desktop-widgets/locationinformation.cpp" line="258"/> <source>You are editing a dive site</source> <translation>您正在編輯潛點</translation> </message> @@ -4226,12 +4235,12 @@ p, li { white-space: pre-wrap; } <translation>新的潛點</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1011"/> <source>Discard the changes?</source> <translation>取消變更？</translation> </message> <message> - <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1013"/> + <location filename="../desktop-widgets/tab-widgets/maintab.cpp" line="1012"/> <source>You are about to discard your changes.</source> <translation>您將要放棄您的變更。</translation> </message> @@ -4290,7 +4299,7 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="171"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="517"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="533"/> <source>Open</source> <translation>開啟</translation> </message> @@ -4586,13 +4595,13 @@ p, li { white-space: pre-wrap; } </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="698"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="227"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="236"/> <source>&Undo</source> <translation>復原</translation> </message> <message> <location filename="../desktop-widgets/mainwindow.ui" line="706"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="228"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="237"/> <source>&Redo</source> <translation>取消還原</translation> </message> @@ -4632,58 +4641,63 @@ p, li { white-space: pre-wrap; } <translation>取用線上雲端儲存</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="327"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="363"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="344"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="380"/> <source>Connect to</source> <translation>連結至</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="357"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="374"/> <source>Disconnect from</source> <translation>從中斷</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="508"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="553"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1581"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="524"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="569"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1597"/> <source>Please save or cancel the current dive edit before opening a new file.</source> <translation>在開啟新檔前，請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="514"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="530"/> <source>Open file</source> <translation>開啟檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="518"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="631"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="534"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="646"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Cancel</source> <translation>取消</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="627"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="601"/> + <source>Don't save an empty log to the cloud</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/mainwindow.cpp" line="642"/> <source>Traverse image directories</source> <translation>經過照片路徑</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="630"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="645"/> <source>Scan</source> <translation>掃描</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="638"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="653"/> <source>Scanning images...(this can take a while)</source> <translation>掃描影像...(需要稍待一段時間)</translation> </message> <message> <location filename="../desktop-widgets/divelistview.cpp" line="584"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="664"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="679"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Warning</source> <translation>提醒</translation> </message> @@ -4693,105 +4707,105 @@ p, li { white-space: pre-wrap; } <translation>以 %1 min 時間區間嘗試合併潛水記錄</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="689"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="704"/> <source>Please save or cancel the current dive edit before closing the file.</source> <translation>在關閉檔案前，請儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="810"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="825"/> <source>Please save or cancel the current dive edit before trying to add a dive.</source> <translation>在新增潛水前，請先儲存或取消此次潛水的編輯。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="862"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="877"/> <source>Print runtime table</source> <translation>列印操作表格</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="919"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="935"/> <source>Trying to replan a dive that's not a planned dive.</source> <translation>嘗試針對非原計畫的潛水進行重新規畫. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1004"/> - <location filename="../desktop-widgets/mainwindow.cpp" line="1885"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1020"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1882"/> <source>Please, first finish the current edition before trying to do another.</source> <translation>請在嘗試其他編輯時先完成當前編輯</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1010"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1026"/> <source>Trying to edit a dive that's not a manually added dive.</source> <translation>嘗試編輯非手動建立的潛水記錄. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1057"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1073"/> <source>Yearly statistics</source> <translation>年統計</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1280"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1296"/> <source>Do you want to save the changes that you made in the file %1?</source> <translation>您是否要對檔案 %1 所做的修改儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1283"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1299"/> <source>Do you want to save the changes that you made in the data file?</source> <translation>您是否要對資料檔案所做的修改進行儲存? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1288"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1304"/> <source>Save changes?</source> <translation>儲存變更? </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1289"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1305"/> <source>Changes will be lost if you don't save them.</source> <translation>如果不進行儲存，所做變更將會遺失。</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1608"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1624"/> <source>Save file as</source> <translation>另存新檔</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1609"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1625"/> <source>Subsurface XML files (*.ssrf *.xml *.XML)</source> <translation>Subsurface XML 檔案 (*.ssrf *.xml *.XML)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1706"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1712"/> <source>[local cache for] %1</source> <translation>[本地端暫存] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1708"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1714"/> <source>[cloud storage for] %1</source> <translation>[雲端裝置] %1</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1824"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1821"/> <source>Opening datafile from older version</source> <translation>從較舊的版本中開啟資料檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1825"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1822"/> <source>You opened a data file from an older version of Subsurface. We recommend you read the manual to learn about the changes in the new version, especially about dive site management which has changed significantly. Subsurface has already tried to pre-populate the data but it might be worth while taking a look at the new dive site management system and to make sure that everything looks correct.</source> <translation>自舊版的 Subsurface 開啟資料檔案. 建議請先在新版程式中, 閱讀相關變更, 特別是有關潛點管理的部分. Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛點管理系統, 並確認資料是否正確. </translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1836"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1833"/> <source>Open dive log file</source> <translation>打開潛水日誌檔案</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="1837"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="1834"/> <source>Dive log files (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran files (*.can *.CAN);;CSV files (*.csv *.CSV);;DiveLog.de files (*.dld *.DLD);;JDiveLog files (*.jlb *.JLB);;Liquivision files (*.lvd *.LVD);;MkVI files (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft files (*.dlf *.DLF);;UDDF/UDCF files (*.uddf *.udcf *.UDDF *.UDCF);;XML files (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog Files (*.log *.LOG);;OSTCtools Files (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;All files (*)</source> <translation>潛水日誌檔案 (*.ssrf *.can *.csv *.db *.sql *.dld *.jlb *.lvd *.sde *.udcf *.uddf *.xml *.txt *.dlf *.apd *.zxu *.zxl*.SSRF *.CAN *.CSV *.DB *.SQL *.DLD *.JLB *.LVD *.SDE *.UDCF *.UDDF *.xml *.TXT *.DLF *.APD *.ZXU *.ZXL);;Cochran 檔案 (*.can *.CAN);;CSV 檔案 (*.csv *.CSV);;DiveLog.de 檔案 (*.dld *.DLD);;JDiveLog 檔案 (*.jlb *.JLB);;Liquivision 檔案 (*.lvd *.LVD);;MkVI 檔案 (*.txt *.TXT);;Suunto files (*.sde *.db *.SDE *.DB);;Divesoft 檔案 (*.dlf *.DLF);;UDDF/UDCF 檔案 (*.uddf *.udcf *.UDDF *.UDCF);;XML 檔案 (*.xml *.XML);;APD log viewer (*.apd *.APD);;Datatrak/WLog 檔案 (*.log *.LOG);;OSTCtools 檔案 (*.dive *.DIVE);;DAN DL7 (*.zxu *.zxl *.ZXU *.ZXL);;所有檔案 (*)</translation> </message> <message> - <location filename="../desktop-widgets/mainwindow.cpp" line="2014"/> + <location filename="../desktop-widgets/mainwindow.cpp" line="2019"/> <source>Contacting cloud service...</source> <translation>聯絡雲端服務...</translation> </message> @@ -4799,7 +4813,7 @@ Subsurface 已嘗試預先填寫部分資料, 值得花些時間看看新的潛 <context> <name>MapWidget</name> <message> - <location filename="../mobile-widgets/qml/MapWidget.qml" line="258"/> + <location filename="../mobile-widgets/qml/MapWidget.qml" line="259"/> <source>Drag the selected dive location</source> <translation type="unfinished"/> </message> @@ -5116,32 +5130,12 @@ If your device uses Bluetooth, do the same preparations as for a logbook downloa </message> <message> <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="20"/> - <source>Dive site geo lookup</source> - <translation>潛點座標搜尋</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="26"/> - <source>Enable geocoding for dive site management</source> - <translation>潛點系統管理啟用座標化</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="33"/> - <source>Parse site without GPS data</source> - <translation>解析無 GPS 資料潛點</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="40"/> - <source>Same format for existing dives</source> - <translation>現存潛水記錄使用相同格式</translation> - </message> - <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="50"/> - <source>Dive Site Layout</source> - <translation>潛點資訊配置</translation> + <source>Dive site layout</source> + <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="72"/> - <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="89"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="42"/> + <location filename="../desktop-widgets/preferences/prefs_georeference.ui" line="59"/> <source>/</source> <translation>/</translation> </message> @@ -5445,7 +5439,7 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> </message> <message> <location filename="../desktop-widgets/preferences/preferences_network.ui" line="156"/> - <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="139"/> <source>Subsurface cloud storage</source> <translation>Subsurface 雲端裝置</translation> </message> @@ -5526,6 +5520,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Subsurface cloud storage (credentials verified)</source> <translation>Subsurface 雲端裝置 (證件認證)</translation> </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="135"/> + <source>Subsurface cloud storage (incorrect password)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../desktop-widgets/preferences/preferences_network.cpp" line="137"/> + <source>Subsurface cloud storage (PIN required)</source> + <translation type="unfinished"/> + </message> </context> <context> <name>PreferencesUnits</name> @@ -5796,28 +5800,28 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>匯入</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="129"/> + <location filename="../desktop-widgets/printoptions.cpp" line="131"/> <source>Import template file</source> <translation>匯入樣板檔案</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="130"/> - <location filename="../desktop-widgets/printoptions.cpp" line="143"/> + <location filename="../desktop-widgets/printoptions.cpp" line="132"/> + <location filename="../desktop-widgets/printoptions.cpp" line="145"/> <source>HTML files (*.html)</source> <translation>HTML 檔案 (*.html)</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="142"/> + <location filename="../desktop-widgets/printoptions.cpp" line="144"/> <source>Export template files as</source> <translation>匯出樣板檔案至</translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="153"/> + <location filename="../desktop-widgets/printoptions.cpp" line="155"/> <source>This action cannot be undone!</source> <translation>此動作無法完成! </translation> </message> <message> - <location filename="../desktop-widgets/printoptions.cpp" line="154"/> + <location filename="../desktop-widgets/printoptions.cpp" line="156"/> <source>Delete template: %1?</source> <translation>刪除樣板: %1? </translation> </message> @@ -5825,12 +5829,12 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>ProfileWidget2</name> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="775"/> + <location filename="../profile-widget/profilewidget2.cpp" line="781"/> <source> (#%1 of %2)</source> <translation> (#%1 of %2)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="782"/> + <location filename="../profile-widget/profilewidget2.cpp" line="777"/> <source>Unknown dive computer</source> <translation>未知的潛水電腦</translation> </message> @@ -5840,108 +5844,108 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <translation>當超過處理時間，顯示關閉 NDL / TTS</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1402"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1401"/> <source>Add gas change</source> <translation>增加氣瓶交換</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1405"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1404"/> <source> (Tank %1)</source> <translation> (Tank %1)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1388"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1387"/> <source>Make first dive computer</source> <translation>設定優先潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="778"/> + <location filename="../profile-widget/profilewidget2.cpp" line="773"/> <source>Planned dive</source> <translation>計畫潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="780"/> + <location filename="../profile-widget/profilewidget2.cpp" line="775"/> <source>Manually added dive</source> <translation>手動新增潛水</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1390"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1389"/> <source>Delete this dive computer</source> <translation>刪除此潛水電腦</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1411"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1410"/> <source>Add setpoint change</source> <translation>增加設置點變更</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1413"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1412"/> <source>Add bookmark</source> <translation>新增書籤</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1417"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1416"/> <source>Edit the profile</source> <translation>編輯摘要</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1421"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1420"/> <source>Remove event</source> <translation>移除事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1426"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1425"/> <source>Hide similar events</source> <translation>隱藏相似事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1433"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1432"/> <source>Edit name</source> <translation>潛水名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1464"/> - <location filename="../profile-widget/profilewidget2.cpp" line="1471"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1463"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1470"/> <source>Adjust pressure of tank %1 (currently interpolated as %2)</source> <translation>調整氣瓶 %1 壓力 (以 %2 插入目前位置)</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1486"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1485"/> <source>Unhide all events</source> <translation>取消隱藏所有事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide events</source> <translation>隱藏事件</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1521"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1520"/> <source>Hide all %1 events?</source> <translation>隱藏所有 %1 事件?</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1555"/> <source>Remove the selected event?</source> <translation>移除所選擇的事件？</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1557"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1556"/> <source>%1 @ %2:%3</source> <translation>%1 @ %2:%3</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1679"/> <source>Edit name of bookmark</source> <translation>編輯書籤名稱</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1681"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1680"/> <source>Custom name:</source> <translation>自訂名稱:</translation> </message> <message> - <location filename="../profile-widget/profilewidget2.cpp" line="1686"/> + <location filename="../profile-widget/profilewidget2.cpp" line="1685"/> <source>Name is too long!</source> <translation>名稱太長！</translation> </message> @@ -5949,147 +5953,147 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <context> <name>QMLManager</name> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="131"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="269"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="136"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="290"/> <source>Starting...</source> <translation>開始...</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="186"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="191"/> <source>Open local dive data file</source> <translation>開啟本機端潛水資料檔</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="194"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="199"/> <source>Opening local data file failed</source> <translation>開啟本機端檔案失敗</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="217"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="231"/> <source>%1 dives loaded from local dive data file</source> <translation>%1 潛水記錄載入自本機端潛水資料檔案</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="293"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="314"/> <source>working in no-cloud mode</source> <translation>於非雲端模式工作</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="298"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="319"/> <source>Error parsing local storage, giving up</source> <translation>本機端解析錯誤, 中斷</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="307"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="328"/> <source>no cloud credentials</source> <translation>無雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="308"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="382"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="329"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="403"/> <source>Please enter valid cloud credentials.</source> <translation>請輸入合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="349"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="370"/> <source>Cloud storage email and password can only consist of letters, numbers, and '.', '-', '_', and '+'.</source> <translation>雲端裝置 email 與密碼只接受使用字母, 數字, 與 '.', '-', '_', 和 '+'. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="355"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="376"/> <source>Invalid format for email address</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="396"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> <source>Attempting to open cloud storage with new credentials</source> <translation>嘗試使用新的憑證開啟雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="417"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="438"/> <source>Testing cloud credentials</source> <translation>測試雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="431"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="452"/> <source>No response from cloud server to validate the credentials</source> <translation>雲端伺服器認證憑證無回應</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="439"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="460"/> <source>Incorrect cloud credentials</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="445"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="466"/> <source>Cannot connect to cloud storage - cloud account not verified</source> <translation>無法連結雲端儲存 - 未認證的帳號</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="477"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="498"/> <source>Cloud credentials are invalid</source> <translation>不合法的雲端憑證</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="490"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="511"/> <source>Cannot open cloud storage: Error creating https connection</source> <translation>無法開啟雲端儲存: 建立 https 連線錯誤</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="503"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="524"/> <source>Cannot open cloud storage: %1</source> <translation>無法開啟雲端儲存: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="515"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="536"/> <source>Cannot connect to cloud storage</source> <translation>無法連結雲端儲存</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="539"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="560"/> <source>Cloud credentials valid, loading dives...</source> <translation>雲端認證成功, 載入日誌</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="551"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="572"/> <source>Cloud storage error: %1</source> <translation>雲端儲存錯誤: %1</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="594"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="615"/> <source>Loading dives from local storage ('no cloud' mode)</source> <translation>從本機端載入日誌 (本機模式)</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="639"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="660"/> <source>Failed to connect to cloud server, reverting to no cloud status</source> <translation>連結雲端伺服器失敗, 返回非雲端狀態</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="664"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="685"/> <source>Cloud storage open successfully. No dives in dive list.</source> <translation>成功開啟雲端儲存. 列表無潛水記錄. </translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> <source>h</source> <translation>h</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="835"/> - <location filename="../mobile-widgets/qmlmanager.cpp" line="836"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="856"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="857"/> <source>min</source> <translation>min</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="834"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="855"/> <source>sec</source> <translation>sec</translation> </message> <message> - <location filename="../mobile-widgets/qmlmanager.cpp" line="1223"/> + <location filename="../mobile-widgets/qmlmanager.cpp" line="1270"/> <source>Unknown GPS location</source> <translation>未知的GPS位置</translation> </message> @@ -6247,6 +6251,16 @@ See http://doc.qt.io/qt-5/qdatetime.html#toString</source> <source>Malformed XML response. Line %1: %2</source> <translation>異常的 XML 回應. 第 %1 行: %2</translation> </message> + <message> + <location filename="../core/divesite.cpp" line="20"/> + <source>No dive site layout categories set in preferences!</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/divesite.cpp" line="28"/> + <source>Tags</source> + <translation>標籤</translation> + </message> </context> <context> <name>ReadSettingsThread</name> @@ -6662,64 +6676,64 @@ Files with inappropriate date/time</source> <context> <name>SocialNetworkDialog</name> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="362"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="370"/> <source>Small</source> <translation type="unfinished"/> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="363"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="371"/> <source>Medium</source> <translation>中</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="383"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> <source>Dive date: %1 </source> <translation>潛水日期: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="386"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> <source>Duration: %1 </source> <translation>時間: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="387"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="395"/> <source>h</source> <comment>abbreviation for hours</comment> <translation>h</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="388"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="396"/> <source>min</source> <comment>abbreviation for minutes</comment> <translation>min</translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="391"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="399"/> <source>Dive location: %1 </source> <translation>潛水地點: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="394"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="402"/> <source>Buddy: %1 </source> <translation>潛伴: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="397"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="405"/> <source>Divemaster: %1 </source> <translation>潛導: %1 </translation> </message> <message> - <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="400"/> + <location filename="../desktop-widgets/plugins/facebook/facebookconnectwidget.cpp" line="408"/> <source> %1</source> <translation> @@ -6812,12 +6826,12 @@ Files with inappropriate date/time</source> <context> <name>StartPage</name> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="35"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="36"/> <source>To use Subsurface-mobile with Subsurface cloud storage, please enter your cloud credentials.<br/><br/>If this is the first time you use Subsurface cloud storage, enter a valid email (all lower case) and a password of your choice (letters and numbers).<br/><br/>To use Subsurface-mobile only with local data on this device, select the no cloud buttton above.</source> <translation type="unfinished"/> </message> <message> - <location filename="../mobile-widgets/qml/StartPage.qml" line="48"/> + <location filename="../mobile-widgets/qml/StartPage.qml" line="49"/> <source>Thank you for registering with Subsurface. We sent <b>%1</b> a PIN code to complete the registration. If you do not receive an email from us within 15 minutes, please check the correct spelling of your email address and your spam box first.<br/><br/>In case of any problems regarding cloud account setup, please contact us at our user forum (https://subsurface-divelog.org/user-forum/).<br/><br/></source> <translation type="unfinished"/> </message> @@ -7442,7 +7456,7 @@ mixed from Air and using: <context> <name>TextHyperlinkEventFilter</name> <message> - <location filename="../desktop-widgets/simplewidgets.cpp" line="728"/> + <location filename="../desktop-widgets/simplewidgets.cpp" line="729"/> <source>%1click to visit %2</source> <translation>按下 %1 前往 %2</translation> </message> @@ -8398,8 +8412,8 @@ Maximum</source> <message> <location filename="../core/dive.c" line="34"/> <location filename="../core/equipment.c" line="91"/> - <location filename="../core/planner.c" line="1124"/> - <location filename="../core/planner.c" line="1127"/> + <location filename="../core/planner.c" line="1135"/> + <location filename="../core/planner.c" line="1138"/> <source>oxygen</source> <translation>氧氣</translation> </message> @@ -8484,15 +8498,15 @@ Maximum</source> <translation>kg</translation> </message> <message> - <location filename="../core/dive.c" line="1841"/> + <location filename="../core/dive.c" line="1856"/> <source>(%s) or (%s)</source> <translation>(%s) 或 (%s)</translation> </message> <message> - <location filename="../core/divelist.c" line="497"/> + <location filename="../core/divelist.c" line="680"/> <location filename="../core/equipment.c" line="87"/> - <location filename="../core/planner.c" line="1120"/> - <location filename="../core/planner.c" line="1123"/> + <location filename="../core/planner.c" line="1131"/> + <location filename="../core/planner.c" line="1134"/> <source>air</source> <translation>air</translation> </message> @@ -8721,7 +8735,7 @@ Maximum</source> </message> <message> <location filename="../core/libdivecomputer.c" line="239"/> - <location filename="../core/parse-xml.c" line="3475"/> + <location filename="../core/parse-xml.c" line="3476"/> <location filename="../core/uemis-downloader.c" line="137"/> <source>unknown</source> <translation>未知</translation> @@ -8979,7 +8993,7 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>無法解析訊息 '%s'</translation> </message> <message> - <location filename="../core/parse-xml.c" line="3997"/> + <location filename="../core/parse-xml.c" line="3998"/> <source>Can't open stylesheet %s</source> <translation>無法開啟樣式 %s</translation> </message> @@ -8995,21 +9009,21 @@ You can create this logfile by selecting the corresponding checkbox in the downl </message> <message> <location filename="../core/plannernotes.c" line="78"/> - <location filename="../core/plannernotes.c" line="392"/> - <location filename="../core/plannernotes.c" line="398"/> - <location filename="../core/plannernotes.c" line="431"/> - <location filename="../core/plannernotes.c" line="466"/> - <location filename="../core/plannernotes.c" line="478"/> + <location filename="../core/plannernotes.c" line="401"/> + <location filename="../core/plannernotes.c" line="407"/> + <location filename="../core/plannernotes.c" line="446"/> + <location filename="../core/plannernotes.c" line="482"/> + <location filename="../core/plannernotes.c" line="494"/> <source>Warning:</source> <translation>提醒:</translation> </message> <message> - <location filename="../core/plannernotes.c" line="333"/> + <location filename="../core/plannernotes.c" line="342"/> <source>, effective GF=%d/%d</source> <translation>, effective GF=%d/%d</translation> </message> <message> - <location filename="../core/planner.c" line="318"/> + <location filename="../core/planner.c" line="320"/> <location filename="../desktop-widgets/simplewidgets.cpp" line="210"/> <source>SP change</source> <translation>SP 變更</translation> @@ -9025,195 +9039,211 @@ You can create this logfile by selecting the corresponding checkbox in the downl <translation>BUHLMANN</translation> </message> <message> - <location filename="../core/plannernotes.c" line="108"/> + <location filename="../core/plannernotes.c" line="92"/> + <source>dive plan</b> (Overlapping dives detected)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="114"/> + <source>Runtime: %dmin %s</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="117"/> <source>Runtime: %dmin<br></div></source> <translation><div>Runtime: %dmin</div><br></translation> </message> <message> - <location filename="../core/plannernotes.c" line="114"/> + <location filename="../core/plannernotes.c" line="123"/> <source>depth</source> <translation>深度</translation> </message> <message> - <location filename="../core/plannernotes.c" line="117"/> + <location filename="../core/plannernotes.c" line="126"/> <source>duration</source> <translation>時間</translation> </message> <message> - <location filename="../core/plannernotes.c" line="120"/> + <location filename="../core/plannernotes.c" line="129"/> <source>runtime</source> <translation>作業時間</translation> </message> <message> - <location filename="../core/plannernotes.c" line="123"/> + <location filename="../core/plannernotes.c" line="132"/> <source>gas</source> <translation>氣體</translation> </message> <message> - <location filename="../core/plannernotes.c" line="170"/> + <location filename="../core/plannernotes.c" line="179"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>轉換至 %.*f %s in %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="178"/> + <location filename="../core/plannernotes.c" line="187"/> <source>Transition to %.*f %s in %d:%02d min - runtime %d:%02u on %s</source> <translation>禁搭飛機 %.*f %s 在 %d:%02d min - 運行時間 %d:%02u 在 %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="191"/> + <location filename="../core/plannernotes.c" line="200"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s (SP = %.1fbar)</source> <translation>停留於 %.*f %s for %d:%02d min - 運行時間 %d:%02u on %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="198"/> + <location filename="../core/plannernotes.c" line="207"/> <source>Stay at %.*f %s for %d:%02d min - runtime %d:%02u on %s</source> <translation>停留在 %.*f %s for %d:%02d min - 運作時間 %d:%02u 於 %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="244"/> + <location filename="../core/plannernotes.c" line="253"/> <source>%3.0f%s</source> <translation>%3.0f%s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="247"/> - <location filename="../core/plannernotes.c" line="251"/> + <location filename="../core/plannernotes.c" line="256"/> + <location filename="../core/plannernotes.c" line="260"/> <source>%3dmin</source> <translation>%3dmin</translation> </message> <message> - <location filename="../core/plannernotes.c" line="260"/> - <location filename="../core/plannernotes.c" line="272"/> + <location filename="../core/plannernotes.c" line="269"/> + <location filename="../core/plannernotes.c" line="281"/> <source>(SP = %.1fbar)</source> <translation>(SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="295"/> + <location filename="../core/plannernotes.c" line="304"/> <source>Switch gas to %s (SP = %.1fbar)</source> <translation>氣體交換至 %s (SP = %.1fbar)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="297"/> + <location filename="../core/plannernotes.c" line="306"/> <source>Switch gas to %s</source> <translation>更換氣體至 %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="317"/> + <location filename="../core/plannernotes.c" line="326"/> <source>CNS</source> <translation>CNS</translation> </message> <message> - <location filename="../core/plannernotes.c" line="319"/> + <location filename="../core/plannernotes.c" line="328"/> <source>OTU</source> <translation>氧容許量 OTU</translation> </message> <message> - <location filename="../core/plannernotes.c" line="329"/> + <location filename="../core/plannernotes.c" line="338"/> <source>Deco model: VPM-B at nominal conservatism</source> <translation>減壓模型: VPM-B 基於公定保守等級</translation> </message> <message> + <location filename="../core/plannernotes.c" line="433"/> + <source>Minimum gas</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="434"/> + <source>based on</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/plannernotes.c" line="436"/> + <source>SAC</source> + <translation>耗氣率</translation> + </message> + <message> <location filename="../core/plannernotes.c" line="90"/> - <location filename="../core/plannernotes.c" line="98"/> + <location filename="../core/plannernotes.c" line="99"/> + <location filename="../core/plannernotes.c" line="105"/> <source>Subsurface</source> <translation>Subsurface</translation> </message> <message> - <location filename="../core/plannernotes.c" line="92"/> + <location filename="../core/plannernotes.c" line="107"/> <source>dive plan</b> (surface interval </source> <translation>潛水計畫 </b> (水面區間</translation> </message> <message> - <location filename="../core/plannernotes.c" line="94"/> + <location filename="../core/plannernotes.c" line="109"/> <source>created on</source> <translation>建立於</translation> </message> <message> - <location filename="../core/plannernotes.c" line="100"/> + <location filename="../core/plannernotes.c" line="101"/> <source>dive plan</b> created on</source> <translation>潛水計畫 </b> 建立於</translation> </message> <message> - <location filename="../core/plannernotes.c" line="105"/> - <source>Runtime: %dmin VARIATIONS<br></div></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="324"/> + <location filename="../core/plannernotes.c" line="333"/> <source>Deco model: Bühlmann ZHL-16C with GFLow = %d%% and GFHigh = %d%%</source> <translation>減壓模型: Bühlmann ZHL-16C 以 GFLow = %d%% 與 GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="331"/> + <location filename="../core/plannernotes.c" line="340"/> <source>Deco model: VPM-B at +%d conservatism</source> <translation>減壓模型: VPM-B at +%d 保守等級</translation> </message> <message> - <location filename="../core/plannernotes.c" line="337"/> + <location filename="../core/plannernotes.c" line="346"/> <source>Deco model: Recreational mode based on Bühlmann ZHL-16B with GFLow = %d%% and GFHigh = %d%%</source> <translation>減壓模型: 休閒模式根據 Bühlmann ZHL-16B 以 GFLow = %d%% 與 GFHigh = %d%%</translation> </message> <message> - <location filename="../core/plannernotes.c" line="345"/> + <location filename="../core/plannernotes.c" line="354"/> <source>ATM pressure: %dmbar (%d%s)<br></div></source> <translation>ATM 壓力: %dmbar (%d%s)<br></div></translation> </message> <message> - <location filename="../core/plannernotes.c" line="363"/> + <location filename="../core/plannernotes.c" line="372"/> <source>Gas consumption (CCR legs excluded):</source> <translation>氣體消耗 (排除 CCR legs):</translation> </message> <message> - <location filename="../core/plannernotes.c" line="365"/> + <location filename="../core/plannernotes.c" line="374"/> <source>Gas consumption (based on SAC</source> <translation>氣體消耗 (基於 SAC</translation> </message> <message> - <location filename="../core/plannernotes.c" line="393"/> + <location filename="../core/plannernotes.c" line="402"/> <source>this is more gas than available in the specified cylinder!</source> <translation>指定的氣瓶氣體超過供給量！</translation> </message> <message> - <location filename="../core/plannernotes.c" line="399"/> + <location filename="../core/plannernotes.c" line="408"/> <source>not enough reserve for gas sharing on ascent!</source> <translation>無足夠的預留氣體可供上升使用！</translation> </message> <message> - <location filename="../core/plannernotes.c" line="421"/> - <source><br>&nbsp;&mdash; <span style='color: %s;'>Minimum gas</span> (based on %.1fxSAC/+%dmin@%.0f%s): %.0f%s/%.0f%s/<span style='color: %s;'>&Delta;:%+.0f%s</span></source> - <translation type="unfinished"/> - </message> - <message> - <location filename="../core/plannernotes.c" line="432"/> + <location filename="../core/plannernotes.c" line="447"/> <source>required minimum gas for ascent already exceeding start pressure of cylinder!</source> <translation>上升所需要最少氣源已達氣瓶的起始壓力! </translation> </message> <message> - <location filename="../core/plannernotes.c" line="435"/> + <location filename="../core/plannernotes.c" line="451"/> <source>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s in planned ascent)</source> <translation>%.0f%s/%.0f%s of <span style='color: red;'><b>%s</b></span> (%.0f%s/%.0f%s 計畫上升)</translation> </message> <message> - <location filename="../core/plannernotes.c" line="438"/> + <location filename="../core/plannernotes.c" line="454"/> <source>%.0f%s (%.0f%s during planned ascent) of <span style='color: red;'><b>%s</b></span></source> <translation>%.0f%s (%.0f%s 根據計劃上升) of <span style='color: red;'><b>%s</b></span></translation> </message> <message> - <location filename="../core/plannernotes.c" line="463"/> + <location filename="../core/plannernotes.c" line="479"/> <source>high pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>高 pO₂ 數值 %.2f 發生於 %d:%02u 使用氣體 %s 在深度 %.*f %s</translation> </message> <message> - <location filename="../core/plannernotes.c" line="475"/> + <location filename="../core/plannernotes.c" line="491"/> <source>low pO₂ value %.2f at %d:%02u with gas %s at depth %.*f %s</source> <translation>低 pO₂ 數值 %.2f 在 %d:%02u 使用氣源 %s 停留深度 %.*f %s</translation> </message> <message> - <location filename="../core/planner.c" line="871"/> + <location filename="../core/planner.c" line="876"/> <source>Can't find gas %s</source> <translation>無法找到氣體 %s</translation> </message> <message> - <location filename="../core/planner.c" line="1128"/> + <location filename="../core/planner.c" line="1139"/> <source>ean</source> <translation>ean</translation> </message> @@ -9807,6 +9837,31 @@ EADD: %d%s / %.1fg/ℓ <translation>潛水狀態</translation> </message> <message> + <location filename="../core/statistics.c" line="142"/> + <source>All (by type stats)</source> + <translation type="unfinished"/> + </message> + <message> + <location filename="../core/statistics.c" line="144"/> + <source>OC</source> + <translation>OC</translation> + </message> + <message> + <location filename="../core/statistics.c" line="146"/> + <source>CCR</source> + <translation>CCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="148"/> + <source>pSCR</source> + <translation>pSCR</translation> + </message> + <message> + <location filename="../core/statistics.c" line="150"/> + <source>Freedive</source> + <translation>自由潛水</translation> + </message> + <message> <location filename="../core/statistics.c" line="195"/> <source>All (by trip stats)</source> <translation>全部 (根據旅程資訊)</translation> @@ -9842,97 +9897,97 @@ EADD: %d%s / %.1fg/ℓ <translation>(無潛水)</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sun</source> <translation>周日</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Mon</source> <translation>周一</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Tue</source> <translation>周二</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Wed</source> <translation>周三</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Thu</source> <translation>周四</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Fri</source> <translation>周五</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="134"/> + <location filename="../core/subsurfacestartup.c" line="131"/> <source>Sat</source> <translation>周六</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jan</source> <translation>1月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Feb</source> <translation>2月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Mar</source> <translation>3月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Apr</source> <translation>4月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>May</source> <translation>5月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="143"/> + <location filename="../core/subsurfacestartup.c" line="140"/> <source>Jun</source> <translation>6月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Jul</source> <translation>7月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Aug</source> <translation>8月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Sep</source> <translation>9月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Oct</source> <translation>10月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Nov</source> <translation>11月</translation> </message> <message> - <location filename="../core/subsurfacestartup.c" line="144"/> + <location filename="../core/subsurfacestartup.c" line="141"/> <source>Dec</source> <translation>12月</translation> </message> @@ -10162,6 +10217,7 @@ Uemis Zurich 已正確插入？</translation> <translation>時間:</translation> </message> <message> + <location filename="../core/plannernotes.c" line="438"/> <location filename="../core/worldmap-save.c" line="47"/> <source>min</source> <translation>min</translation> @@ -10267,7 +10323,7 @@ Uemis Zurich 已正確插入？</translation> <translation>深度</translation> </message> <message> - <location filename="../profile-widget/diveprofileitem.cpp" line="197"/> + <location filename="../profile-widget/diveprofileitem.cpp" line="198"/> <source>planned waypoint above ceiling</source> <translation>根據深度計畫路徑點</translation> </message> @@ -10307,22 +10363,22 @@ Uemis Zurich 已正確插入？</translation> <translation>城市</translation> </message> <message> - <location filename="../core/save-git.c" line="985"/> + <location filename="../core/save-git.c" line="955"/> <source>Start saving data</source> <translation>開始儲存資料</translation> </message> <message> - <location filename="../core/save-git.c" line="994"/> + <location filename="../core/save-git.c" line="964"/> <source>Start saving dives</source> <translation>開始儲存潛水記錄</translation> </message> <message> - <location filename="../core/save-git.c" line="1027"/> + <location filename="../core/save-git.c" line="997"/> <source>Done creating local cache</source> <translation>分配本機端空間成功</translation> </message> <message> - <location filename="../core/save-git.c" line="1258"/> + <location filename="../core/save-git.c" line="1237"/> <source>Preparing to save data</source> <translation>準備儲存資料</translation> </message> |